From a86aed1d459024ab2a97d98115ef57f8dce808e6 Mon Sep 17 00:00:00 2001
From: admin:huo123456@qq <496960745@qq.com>
Date: 星期一, 21 一月 2019 09:15:44 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/Process_survey.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Process_survey.java b/gx_tieta/src/com/fgkj/dto/Process_survey.java
index c648fdb..80e9aa8 100644
--- a/gx_tieta/src/com/fgkj/dto/Process_survey.java
+++ b/gx_tieta/src/com/fgkj/dto/Process_survey.java
@@ -13,7 +13,8 @@
private String ServerName;//鏈嶅姟鍚�
private Integer ServerFlag;//鏈嶅姟鍚� 0:鍋滄 1:杩涜涓� 2:鏆備笉寮�鍚�
private Integer OutTime;//杩涚▼瓒呮椂鏃堕棿(绉�)
- private String note;
+ private String note;
+ private String ProcessName_CN;
public Integer getNum() {
return num;
}
@@ -78,14 +79,11 @@
public void setNote(String note) {
this.note = note;
}
- @Override
- public String toString() {
- return "Process_survey [num=" + num + ", ProcessId=" + ProcessId
- + ", ProcessName=" + ProcessName + ", ProcessVersion="
- + ProcessVersion + ", ProcessTime=" + ProcessTime
- + ", Process_starttime=" + Process_starttime + ", ServerName="
- + ServerName + ", ServerFlag=" + ServerFlag + ", OutTime="
- + OutTime + ", note=" + note + "]";
+ public String getProcessName_CN() {
+ return ProcessName_CN;
+ }
+ public void setProcessName_CN(String processName_CN) {
+ ProcessName_CN = processName_CN;
}
--
Gitblit v1.9.1