From 0edab78d73d975663da8ce2596a0a00c1b6a6db1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 08:51:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java |    3 ++-
 1 files changed, 2 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 47cc36b..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,12 +65,13 @@
 		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=?,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());
 		list.add(dev_record.getSolve_uid());
 		list.add(dev_record.getSolve_uname());
+		list.add(dev_record.getSolve_picture_num());
 		list.add(dev_record.getSolve_record_time());
 		if (dev_record.getSolve_picture_num()>=1) {
 			sql+=",solve_picture_one=? ";

--
Gitblit v1.9.1