From 5c5ae50b09f3b8eeed1128cb9adc86a11fbb8d3c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.15>
Date: 星期四, 01 十一月 2018 09:29:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/Batt_endurance.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
index 17179ac..5d31eee 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
@@ -16,7 +16,7 @@
private String stationName;
private String stationName1;//鐪佺骇
private String stationName2;//甯傜骇
-
+ private String stationName5;//鍖哄幙
private Page page;//鍒嗛〉
public int getNum() {
return num;
@@ -103,6 +103,12 @@
public void setPage(Page page) {
this.page = page;
}
+ public String getStationName5() {
+ return stationName5;
+ }
+ public void setStationName5(String stationName5) {
+ this.stationName5 = stationName5;
+ }
@Override
public String toString() {
return "Batt_endurance [num=" + num + ", deviceId=" + deviceId
@@ -112,9 +118,10 @@
+ ", endurance_actual_timelong=" + endurance_actual_timelong
+ ", is_out_stand=" + is_out_stand + ", note=" + note
+ ", stationName=" + stationName + ", stationName1="
- + stationName1 + ", stationName2=" + stationName2 + ", page="
- + page + "]";
+ + stationName1 + ", stationName2=" + stationName2
+ + ", stationName5=" + stationName5 + ", page=" + page + "]";
}
+
}
--
Gitblit v1.9.1