From 18cf7a6b456cb0f401c48ad16b12de1877541558 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.10>
Date: 星期一, 22 十月 2018 09:50:34 +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 | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/BattMap_information.java b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
index 9ac594a..919e00c 100644
--- a/gx_tieta/src/com/fgkj/dto/BattMap_information.java
+++ b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
@@ -11,7 +11,7 @@
private Double latitude; // 绾害
private String information; //澶囨敞
private Integer FBSDeviceId; //璁惧id
-
+ private Page page;
public BattMap_information() {
super();
@@ -97,15 +97,27 @@
}
+ public Page getPage() {
+ return page;
+ }
+
+
+ public void setPage(Page page) {
+ this.page = page;
+ }
+
+
@Override
public String toString() {
return "BattMap_information [num=" + num + ", StationId=" + StationId
+ ", StationName=" + StationName + ", Address=" + Address
+ ", longitude=" + longitude + ", latitude=" + latitude
+ ", information=" + information + ", FBSDeviceId="
- + FBSDeviceId + "]";
+ + FBSDeviceId + ", page=" + page + "]";
}
+
+
}
--
Gitblit v1.9.1