From 864e4772eea5e0a589b6f6797d0695a3b3dd225e Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:19:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Process_surveyImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Process_surveyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Process_surveyImpl.java
index c63dd7b..abfe3dc 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Process_surveyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Process_surveyImpl.java
@@ -71,6 +71,7 @@
process.setServerName(rs.getString("serverName"));
process.setServerFlag(rs.getInt("serverFlag"));
process.setNote(DAOHelper.sdf.format(new Date()));
+ process.setProcessName_CN(rs.getString("note"));
process.setOutTime(rs.getInt("outTime"));
list.add(process);
}
--
Gitblit v1.9.1