From e051f5c497e691bcd97c81dffa97f7946fd197b1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 16:32:24 +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_devalarm_data.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java
index 8653a09..db4fcbb 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java
@@ -23,6 +23,7 @@
private String stationName;//鏈烘埧鍚嶇О
private String stationName1;//缁存姢鍖哄悕绉�
private String stationName2;//甯傜骇
+ private String stationName5;//鍖哄幙
private String stationId;//鏈烘埧id
private Page page;//鍒嗛〉
private User_inf uinf;
@@ -156,6 +157,12 @@
public void setStationName2(String stationName2) {
this.stationName2 = stationName2;
}
+ public String getStationName5() {
+ return stationName5;
+ }
+ public void setStationName5(String stationName5) {
+ this.stationName5 = stationName5;
+ }
@Override
public String toString() {
return "Batt_devalarm_data [num=" + num + ", record_id=" + record_id
@@ -168,9 +175,10 @@
+ ", usr_id=" + usr_id + ", note=" + note + ", dev_name="
+ dev_name + ", stationName=" + stationName + ", stationName1="
+ stationName1 + ", stationName2=" + stationName2
- + ", stationId=" + stationId + ", page=" + page + ", uinf="
- + uinf + "]";
+ + ", stationName5=" + stationName5 + ", stationId=" + stationId
+ + ", page=" + page + ", uinf=" + uinf + "]";
}
+
}
--
Gitblit v1.9.1