From 0e1721488e6d8f091d13403e20f0bbf5cf397b96 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期二, 18 十二月 2018 18:08:00 +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 | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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..643d9ee 100644
--- a/gx_tieta/src/com/fgkj/dto/BattInf.java
+++ b/gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -81,8 +81,13 @@
private Object obj;
private String station_phone;
+ private String install_user; //瀹夎浜�
+
private Battinf_ex binf_ex;
+ private float charge_curr_max;//鍏呯數鐢垫祦闃堝��
+
+ private String VideoOrImage ;//涓婁紶鏂囦欢鐨勬牸寮�
public BattInf() {
super();
}
@@ -543,6 +548,26 @@
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;
+ }
+
+ public String getVideoOrImage() {
+ return VideoOrImage;
+ }
+ public void setVideoOrImage(String videoOrImage) {
+ VideoOrImage = videoOrImage;
+ }
+ public float getCharge_curr_max() {
+ return charge_curr_max;
+ }
+ public void setCharge_curr_max(float charge_curr_max) {
+ this.charge_curr_max = charge_curr_max;
+ }
@Override
public String toString() {
return "BattInf [num=" + num + ", StationId=" + StationId
@@ -584,7 +609,10 @@
+ ", 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 + ", charge_curr_max="
+ + charge_curr_max + ", VideoOrImage=" + VideoOrImage + "]";
}
+
}
--
Gitblit v1.9.1