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 | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 de25425..550671e 100644
--- a/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
+++ b/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
@@ -17,6 +17,7 @@
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;
@@ -153,6 +154,14 @@
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() {
@@ -164,11 +173,14 @@
+ 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 + ", module_num=" + module_num + ", note=" + note
- + ", page=" + page + "]";
+ + eve_type + ", eve_type_name=" + eve_type_name
+ + ", module_num=" + module_num + ", note=" + note + ", page="
+ + page + "]";
}
+
+
}
--
Gitblit v1.9.1