From db53916414e35580e8f39bc8f7dd1897f8200eda Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 20 十一月 2018 10:00:03 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/BattInf.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index 29e00ba..dc93b0e 100644
--- a/gx_tieta/src/com/fgkj/dto/BattInf.java
+++ b/gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -73,11 +73,18 @@
private Float Load_curr;// 璐熻浇鐢垫祦
private Float DisCurrMax;//鏈�澶ф牳瀹圭數娴�
private String SignalName;
- private Integer StartNum;
+ private Integer StartNum;
+ private Integer Station_install; //鏈烘埧璁惧鏄惁瀹夎
+
private Integer Size;
private Page page;
private Object obj;
private String station_phone;
+
+ private String install_user; //瀹夎浜�
+
+ private Battinf_ex binf_ex;
+
public BattInf() {
super();
}
@@ -526,6 +533,25 @@
public void setStationId_ex(String stationId_ex) {
StationId_ex = stationId_ex;
}
+ public Integer getStation_install() {
+ return Station_install;
+ }
+ public void setStation_install(Integer station_install) {
+ Station_install = station_install;
+ }
+ public Battinf_ex getBinf_ex() {
+ return binf_ex;
+ }
+ public void setBinf_ex(Battinf_ex binf_ex) {
+ this.binf_ex = binf_ex;
+ }
+
+ public String getInstall_user() {
+ return install_user;
+ }
+ public void setInstall_user(String install_user) {
+ this.install_user = install_user;
+ }
@Override
public String toString() {
return "BattInf [num=" + num + ", StationId=" + StationId
@@ -565,14 +591,11 @@
+ ", SignalId=" + SignalId + ", CInterFaceId=" + CInterFaceId
+ ", Load_curr=" + Load_curr + ", DisCurrMax=" + DisCurrMax
+ ", SignalName=" + SignalName + ", StartNum=" + StartNum
- + ", Size=" + Size + ", page=" + page + ", obj=" + obj
- + ", station_phone=" + station_phone + "]";
+ + ", Station_install=" + Station_install + ", Size=" + Size
+ + ", page=" + page + ", obj=" + obj + ", station_phone="
+ + station_phone + ", install_user=" + install_user
+ + ", binf_ex=" + binf_ex + "]";
}
-
-
-
-
-
}
--
Gitblit v1.9.1