From b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:31:23 +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/Batt_endurance.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
index 83c04bc..5d31eee 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
@@ -16,6 +16,8 @@
private String stationName;
private String stationName1;//鐪佺骇
private String stationName2;//甯傜骇
+ private String stationName5;//鍖哄幙
+ private Page page;//鍒嗛〉
public int getNum() {
return num;
}
@@ -95,6 +97,18 @@
public void setStationName2(String stationName2) {
this.stationName2 = stationName2;
}
+ public Page getPage() {
+ return page;
+ }
+ 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
@@ -104,7 +118,8 @@
+ ", endurance_actual_timelong=" + endurance_actual_timelong
+ ", is_out_stand=" + is_out_stand + ", note=" + note
+ ", stationName=" + stationName + ", stationName1="
- + stationName1 + ", stationName2=" + stationName2 + "]";
+ + stationName1 + ", stationName2=" + stationName2
+ + ", stationName5=" + stationName5 + ", page=" + page + "]";
}
--
Gitblit v1.9.1