From 030de8f10eee755bb99fd4b2de83f09e6be6ae72 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 27 十一月 2018 16:06:12 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/BattMap_information.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/BattMap_information.java b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
index 7e10eef..4eb5d00 100644
--- a/gx_tieta/src/com/fgkj/dto/BattMap_information.java
+++ b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
@@ -16,6 +16,7 @@
private String stationName2;
private String stationName3;
private String stationName5;
+ private float monvolstd; //璁惧鏄�2v杩樻槸12鐨勭數姹�
public BattMap_information() {
super();
@@ -111,21 +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 + ", stationName5="
- + stationName5 + "]";
- }
-
-
public String getStationName1() {
return stationName1;
}
@@ -168,6 +154,32 @@
+ 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