From 162b1ec7816f035de05ef93ba432e64b95c96b7b Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 10:06:16 +0800
Subject: [PATCH] 设备实时告警和历史实时告警加区县

---
 gx_tieta/src/com/fgkj/dto/Batt_devalarm_data_history.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data_history.java b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data_history.java
index c07d189..d3a3d58 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data_history.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data_history.java
@@ -21,6 +21,7 @@
 	
 	private String dev_name;//璁惧鍚嶇О
 	private String stationName;//鏈烘埧鍚嶇О
+	private String stationName5;//鏈烘埧鍚嶇О
 	private String stationId;//鏈烘埧id
 	private Page page;//鍒嗛〉
 	private User_inf uinf;
@@ -138,6 +139,13 @@
 	public void setUinf(User_inf uinf) {
 		this.uinf = uinf;
 	}
+	
+	public String getStationName5() {
+		return stationName5;
+	}
+	public void setStationName5(String stationName5) {
+		this.stationName5 = stationName5;
+	}
 	@Override
 	public String toString() {
 		return "Batt_devalarm_data_history [num=" + num + ", record_id="
@@ -149,9 +157,11 @@
 				+ ", alm_confirmed_time=" + alm_confirmed_time
 				+ ", alm_cleared_type=" + alm_cleared_type + ", usr_id="
 				+ usr_id + ", note=" + note + ", dev_name=" + dev_name
-				+ ", stationName=" + stationName + ", stationId=" + stationId
-				+ ", page=" + page + ", uinf=" + uinf + "]";
+				+ ", stationName=" + stationName + ", stationName5="
+				+ stationName5 + ", stationId=" + stationId + ", page=" + page
+				+ ", uinf=" + uinf + "]";
 	}
 	
 	
+	
 }

--
Gitblit v1.9.1