From b56adb397d5ba2d20f9f2a689a0cba2bf398a6cb Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 03 十一月 2018 11:35:46 +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/Deverror_record.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Deverror_record.java b/gx_tieta/src/com/fgkj/dto/Deverror_record.java
index e92166b..6d1eec5 100644
--- a/gx_tieta/src/com/fgkj/dto/Deverror_record.java
+++ b/gx_tieta/src/com/fgkj/dto/Deverror_record.java
@@ -17,6 +17,7 @@
private String stationName5;
private Date record_time;
private String error_descript;//闂鎻忚堪
+ private String error_dispose;//闂澶勭悊
private int uid;
private int error_en; //闂鏄惁瑙ｅ喅
private String note;
@@ -166,6 +167,13 @@
public void setPicture_num(int picture_num) {
this.picture_num = picture_num;
}
+
+ public String getError_dispose() {
+ return error_dispose;
+ }
+ public void setError_dispose(String error_dispose) {
+ this.error_dispose = error_dispose;
+ }
@Override
public String toString() {
return "Deverror_record [num=" + num + ", stationId=" + stationId
--
Gitblit v1.9.1