From d63d9a1b9bc573ece886b455b70cb20d7a04de96 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 09:39:19 +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/ram/Bts_station_state.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
index 4d36200..6539372 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
@@ -39,6 +39,7 @@
 	private String stationName1;
 	private String stationName2;
 	private String stationName3;
+	private String stationName5;
 	private Page page;
 	
 	
@@ -218,6 +219,12 @@
 	public void setStation_xuhang_tlong(int station_xuhang_tlong) {
 		this.station_xuhang_tlong = station_xuhang_tlong;
 	}
+	public String getStationName5() {
+		return stationName5;
+	}
+	public void setStationName5(String stationName5) {
+		this.stationName5 = stationName5;
+	}
 	@Override
 	public String toString() {
 		return "Bts_station_state [num=" + num + ", station_id=" + station_id
@@ -241,10 +248,12 @@
 				+ station_xuhang_tlong + ", note=" + note + ", stationName="
 				+ stationName + ", stationName1=" + stationName1
 				+ ", stationName2=" + stationName2 + ", stationName3="
-				+ stationName3 + ", page=" + page + "]";
+				+ stationName3 + ", stationName5=" + stationName5 + ", page="
+				+ page + "]";
 	}
 	
 	
 	
 	
+	
 }

--
Gitblit v1.9.1