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 | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index 0c80ec4..dc93b0e 100644
--- a/gx_tieta/src/com/fgkj/dto/BattInf.java
+++ b/gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -81,6 +81,8 @@
private Object obj;
private String station_phone;
+ private String install_user; //瀹夎浜�
+
private Battinf_ex binf_ex;
public BattInf() {
@@ -543,6 +545,13 @@
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
@@ -584,7 +593,9 @@
+ ", SignalName=" + SignalName + ", StartNum=" + StartNum
+ ", Station_install=" + Station_install + ", Size=" + Size
+ ", page=" + page + ", obj=" + obj + ", station_phone="
- + station_phone + ", binf_ex=" + binf_ex + "]";
+ + station_phone + ", install_user=" + install_user
+ + ", binf_ex=" + binf_ex + "]";
}
+
}
--
Gitblit v1.9.1