Merge remote-tracking branch 'origin/master'

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml

@@ -351,7 +351,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			'','','',
 			qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
 			qct.supplier_code, qct.supplier_name, qct.income_time,'','',
-			'','', qct.check_type,'巡检检验' check_name,CONVERT(varchar(10),qct.create_time, 120) createTimeStr,
+			null,'', qct.check_type,'巡检检验' check_name,CONVERT(varchar(10),qct.create_time, 120) createTimeStr,
 		    qct.confirm,qct.confirm_man_name
 			from qc_check_task qct
 			<where>