From 37dc2eac7e0010da4f1b90d3ce4ac30ad23b1544 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 17:32:18 +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/BattPower_off.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/BattPower_off.java b/gx_tieta/src/com/fgkj/dto/BattPower_off.java
index 4718b23..77b7197 100644
--- a/gx_tieta/src/com/fgkj/dto/BattPower_off.java
+++ b/gx_tieta/src/com/fgkj/dto/BattPower_off.java
@@ -15,6 +15,8 @@
private String StationName;
private String StationName1;
+ private String StationName2;
+ private String StationName5;
public BattPower_off() {
super();
@@ -82,6 +84,18 @@
public void setStationName1(String stationName1) {
StationName1 = stationName1;
}
+ public String getStationName2() {
+ return StationName2;
+ }
+ public void setStationName2(String stationName2) {
+ StationName2 = stationName2;
+ }
+ public String getStationName5() {
+ return StationName5;
+ }
+ public void setStationName5(String stationName5) {
+ StationName5 = stationName5;
+ }
@Override
public String toString() {
return "BattPower_off [num=" + num + ", dev_id=" + dev_id
@@ -90,7 +104,8 @@
+ poweroff_stoptime + ", timelong=" + timelong
+ ", power_state=" + power_state + ", note=" + note
+ ", StationName=" + StationName + ", StationName1="
- + StationName1 + "]";
+ + StationName1 + ", StationName2=" + StationName2
+ + ", StationName5=" + StationName5 + "]";
}
--
Gitblit v1.9.1