From 72b008e0b171acb5f3f6f1494a933a76cf190ca8 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.10>
Date: 星期一, 22 十月 2018 16:29:40 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/BattMap_information.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/BattMap_information.java b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
index 919e00c..111b6f0 100644
--- a/gx_tieta/src/com/fgkj/dto/BattMap_information.java
+++ b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
@@ -12,6 +12,9 @@
private String information; //澶囨敞
private Integer FBSDeviceId; //璁惧id
private Page page;
+ private String stationName1;
+ private String stationName2;
+ private String stationName3;
public BattMap_information() {
super();
@@ -113,10 +116,43 @@
+ ", StationName=" + StationName + ", Address=" + Address
+ ", longitude=" + longitude + ", latitude=" + latitude
+ ", information=" + information + ", FBSDeviceId="
- + FBSDeviceId + ", page=" + page + "]";
+ + FBSDeviceId + ", page=" + page + ", stationName1="
+ + stationName1 + ", stationName2=" + stationName2
+ + ", stationName3=" + stationName3 + "]";
}
+ public String getStationName1() {
+ return stationName1;
+ }
+
+
+ public void setStationName1(String stationName1) {
+ this.stationName1 = stationName1;
+ }
+
+
+ public String getStationName2() {
+ return stationName2;
+ }
+
+
+ public void setStationName2(String stationName2) {
+ this.stationName2 = stationName2;
+ }
+
+
+ public String getStationName3() {
+ return stationName3;
+ }
+
+
+ public void setStationName3(String stationName3) {
+ this.stationName3 = stationName3;
+ }
+
+
+
--
Gitblit v1.9.1