From 6382c2a4220ff5774dba39848c2faabf0f7002f1 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期一, 10 十二月 2018 10:39:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
index 831963b..b9031f6 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -65,7 +65,7 @@
 		Deverror_record dev_record=(Deverror_record) obj;
 		List list=new ArrayList();
 		//System.out.println(dev_record);
-		String sql=" update db_battinf.tb_deverror_record set error_dispose=?,error_en=?,solve_uid=?,solve_uname=?,solve_picture_num=?,record_time=? "; 
+		String sql=" update db_battinf.tb_deverror_record set error_dispose=?,error_en=?,solve_uid=?,solve_uname=?,solve_picture_num=?,solve_record_time=? "; 
 		String endSql=" where num=? ";
 	    list.add(dev_record.getError_dispose());
 		list.add(dev_record.getError_en());

--
Gitblit v1.9.1