From a50eeca38aac03ba7a4fb9f27f73133936b8597a Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 05 十二月 2018 17:38:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/Battalarm_data.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Battalarm_data.java b/gx_tieta/src/com/fgkj/dto/Battalarm_data.java
index 0c47b75..d9de664 100644
--- a/gx_tieta/src/com/fgkj/dto/Battalarm_data.java
+++ b/gx_tieta/src/com/fgkj/dto/Battalarm_data.java
@@ -22,6 +22,9 @@
private String stationid;
private String stationname;
+ private String battGroupName;
+ private String alarmname;
+ private String alarmtype;
private String note;
public Battalarm_data() {
@@ -196,6 +199,30 @@
this.note = note;
}
+ public String getBattGroupName() {
+ return battGroupName;
+ }
+
+ public void setBattGroupName(String battGroupName) {
+ this.battGroupName = battGroupName;
+ }
+
+ public String getAlarmname() {
+ return alarmname;
+ }
+
+ public void setAlarmname(String alarmname) {
+ this.alarmname = alarmname;
+ }
+
+ public String getAlarmtype() {
+ return alarmtype;
+ }
+
+ public void setAlarmtype(String alarmtype) {
+ this.alarmtype = alarmtype;
+ }
+
@Override
public String toString() {
return "Battalarm_data [num=" + num + ", BattGroupId=" + BattGroupId
@@ -208,10 +235,13 @@
+ ", alm_confirmed_time=" + alm_confirmed_time
+ ", alm_cleared_type=" + alm_cleared_type + ", usr_Id="
+ usr_Id + ", stationid=" + stationid + ", stationname="
- + stationname + ", note=" + note + "]";
+ + stationname + ", battGroupName=" + battGroupName
+ + ", alarmname=" + alarmname + ", alarmtype=" + alarmtype
+ + ", note=" + note + "]";
}
+
}
--
Gitblit v1.9.1