Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 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);

               }