From c69424cc915d4b49fa2b7df090539904b7780f46 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 15:36:36 +0800
Subject: [PATCH] 设备实时告警加市级筛选

---
 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 1bb7032..8653a09 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java
@@ -22,6 +22,7 @@
 	private String dev_name;//璁惧鍚嶇О
 	private String stationName;//鏈烘埧鍚嶇О
 	private String stationName1;//缁存姢鍖哄悕绉�
+	private String stationName2;//甯傜骇
 	private String stationId;//鏈烘埧id
 	private Page page;//鍒嗛〉
 	private User_inf uinf;
@@ -149,6 +150,12 @@
 	public void setStationName1(String stationName1) {
 		this.stationName1 = stationName1;
 	}
+	public String getStationName2() {
+		return stationName2;
+	}
+	public void setStationName2(String stationName2) {
+		this.stationName2 = stationName2;
+	}
 	@Override
 	public String toString() {
 		return "Batt_devalarm_data [num=" + num + ", record_id=" + record_id
@@ -160,8 +167,9 @@
 				+ alm_confirmed_time + ", alm_cleared_type=" + alm_cleared_type
 				+ ", usr_id=" + usr_id + ", note=" + note + ", dev_name="
 				+ dev_name + ", stationName=" + stationName + ", stationName1="
-				+ stationName1 + ", stationId=" + stationId + ", page=" + page
-				+ ", uinf=" + uinf + "]";
+				+ stationName1 + ", stationName2=" + stationName2
+				+ ", stationId=" + stationId + ", page=" + page + ", uinf="
+				+ uinf + "]";
 	}
 	
 	

--
Gitblit v1.9.1