From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/BattMap_information.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/BattMap_information.java b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
index 111b6f0..4eb5d00 100644
--- a/gx_tieta/src/com/fgkj/dto/BattMap_information.java
+++ b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
@@ -15,6 +15,8 @@
private String stationName1;
private String stationName2;
private String stationName3;
+ private String stationName5;
+ private float monvolstd; //璁惧鏄�2v杩樻槸12鐨勭數姹�
public BattMap_information() {
super();
@@ -110,18 +112,6 @@
}
- @Override
- public String toString() {
- return "BattMap_information [num=" + num + ", StationId=" + StationId
- + ", StationName=" + StationName + ", Address=" + Address
- + ", longitude=" + longitude + ", latitude=" + latitude
- + ", information=" + information + ", FBSDeviceId="
- + FBSDeviceId + ", page=" + page + ", stationName1="
- + stationName1 + ", stationName2=" + stationName2
- + ", stationName3=" + stationName3 + "]";
- }
-
-
public String getStationName1() {
return stationName1;
}
@@ -152,6 +142,42 @@
}
+ public String getStationName5() {
+ return stationName5;
+ }
+
+
+ public void setStationName5(String stationName5) {
+ this.stationName5 = stationName5;
+ }
+
+
+
+
+ public float getMonvolstd() {
+ return monvolstd;
+ }
+
+
+ public void setMonvolstd(float monvolstd) {
+ this.monvolstd = monvolstd;
+ }
+
+
+ @Override
+ public String toString() {
+ return "BattMap_information [num=" + num + ", StationId=" + StationId
+ + ", StationName=" + StationName + ", Address=" + Address
+ + ", longitude=" + longitude + ", latitude=" + latitude
+ + ", information=" + information + ", FBSDeviceId="
+ + FBSDeviceId + ", page=" + page + ", stationName1="
+ + stationName1 + ", stationName2=" + stationName2
+ + ", stationName3=" + stationName3 + ", stationName5="
+ + stationName5 + ", monvolstd=" + monvolstd + "]";
+ }
+
+
+
--
Gitblit v1.9.1