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/Fbsdev_Statechange_inf.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java b/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
index b56d698..550671e 100644
--- a/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
+++ b/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
@@ -16,6 +16,9 @@
private String state_change_reason_name;
private Integer dev_alarm;
private String dev_alarm_name;
+ private int eve_type;
+ private String eve_type_name;
+ private int module_num;
private String note;
private Page page;
@@ -136,17 +139,48 @@
this.page = page;
}
+ public int getEve_type() {
+ return eve_type;
+ }
+
+ public void setEve_type(int eve_type) {
+ this.eve_type = eve_type;
+ }
+
+ public int getModule_num() {
+ return module_num;
+ }
+
+ public void setModule_num(int module_num) {
+ this.module_num = module_num;
+ }
+
+ public String getEve_type_name() {
+ return eve_type_name;
+ }
+
+ public void setEve_type_name(String eve_type_name) {
+ this.eve_type_name = eve_type_name;
+ }
+
@Override
public String toString() {
return "Fbsdev_Statechange_inf [num=" + num + ", dev_id=" + dev_id
- + ", rec_time=" + rec_time + ", last_stat=" + last_stat
- + ", last_stat_name=" + last_stat_name + ", now_stat="
- + now_stat + ", now_stat_name=" + now_stat_name
- + ", state_change_reason=" + state_change_reason
- + ", state_change_reason_name=" + state_change_reason_name
- + ", dev_alarm=" + dev_alarm + ", dev_alarm_name="
- + dev_alarm_name + ", note=" + note + ", page=" + page + "]";
+ + ", rec_time=" + rec_time + ", rec_time1=" + rec_time1
+ + ", last_stat=" + last_stat + ", last_stat_name="
+ + last_stat_name + ", now_stat=" + now_stat
+ + ", now_stat_name=" + now_stat_name + ", state_change_reason="
+ + state_change_reason + ", state_change_reason_name="
+ + state_change_reason_name + ", dev_alarm=" + dev_alarm
+ + ", dev_alarm_name=" + dev_alarm_name + ", eve_type="
+ + eve_type + ", eve_type_name=" + eve_type_name
+ + ", module_num=" + module_num + ", note=" + note + ", page="
+ + page + "]";
}
+
+
+
+
}
--
Gitblit v1.9.1