From e051f5c497e691bcd97c81dffa97f7946fd197b1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 16:32:24 +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 | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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..8de47d5 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
@@ -173,10 +181,10 @@
+ stationName1 + ", stationName2=" + stationName2
+ ", stationName3=" + stationName3 + ", stationName5="
+ stationName5 + ", record_time=" + record_time
- + ", error_descript=" + error_descript + ", uid=" + uid
- + ", error_en=" + error_en + ", note=" + note + ", page="
- + page + ", picture_one_blob=" + picture_one_blob
- + ", picture_two_blob=" + picture_two_blob
+ + ", error_descript=" + error_descript + ", error_dispose="
+ + error_dispose + ", uid=" + uid + ", error_en=" + error_en
+ + ", note=" + note + ", page=" + page + ", picture_one_blob="
+ + picture_one_blob + ", picture_two_blob=" + picture_two_blob
+ ", picture_three_blob=" + picture_three_blob
+ ", picture_four_blob=" + picture_four_blob + ", picture_one="
+ picture_one + ", picture_two=" + picture_two
@@ -186,4 +194,5 @@
+
}
--
Gitblit v1.9.1