From 864e4772eea5e0a589b6f6797d0695a3b3dd225e Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:19:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java b/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java
index 2dd9220..cf60cd8 100644
--- a/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java
+++ b/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java
@@ -8,6 +8,9 @@
private int battgroup_id;
private int battgroup_index;
private int battgroup_mon_cnt;
+ private float battgroup_float_vol;
+ private float battgroup_float_curr;
+ private String battgroup_register_code;
private String stationName;
private String stationName1;
private String stationName2;
@@ -87,14 +90,34 @@
public void setNote(String note) {
this.note = note;
}
+ public float getBattgroup_float_vol() {
+ return battgroup_float_vol;
+ }
+ public void setBattgroup_float_vol(float battgroup_float_vol) {
+ this.battgroup_float_vol = battgroup_float_vol;
+ }
+ public float getBattgroup_float_curr() {
+ return battgroup_float_curr;
+ }
+ public void setBattgroup_float_curr(float battgroup_float_curr) {
+ this.battgroup_float_curr = battgroup_float_curr;
+ }
+ public String getBattgroup_register_code() {
+ return battgroup_register_code;
+ }
+ public void setBattgroup_register_code(String battgroup_register_code) {
+ this.battgroup_register_code = battgroup_register_code;
+ }
@Override
public String toString() {
return "App_bts_battgroup [num=" + num + ", dev_id=" + dev_id + ", battgroup_id=" + battgroup_id
- + ", battgroup_index=" + battgroup_index + ", battgroup_mon_cnt=" + battgroup_mon_cnt + ", stationName="
- + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3="
- + stationName3 + ", stationName5=" + stationName5 + ", stationId=" + stationId + ", note=" + note + "]";
+ + ", battgroup_index=" + battgroup_index + ", battgroup_mon_cnt=" + battgroup_mon_cnt
+ + ", battgroup_float_vol=" + battgroup_float_vol + ", battgroup_float_curr=" + battgroup_float_curr
+ + ", battgroup_register_code=" + battgroup_register_code + ", stationName=" + stationName
+ + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3=" + stationName3
+ + ", stationName5=" + stationName5 + ", stationId=" + stationId + ", note=" + note + "]";
}
-
+
}
--
Gitblit v1.9.1