Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32149 -r32294
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32149)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32294)
@@ -814,6 +814,7 @@
 	{name : 'basketBarcode'},
 	{name : 'status'},
 	{name : 'dateTime'},
+	{name : 'recyclingUser'},
 	{name : 'errors'},
 	{name : 'damages'},
 	{name : 'supplierName'},
@@ -1132,17 +1133,24 @@
 		    sortable: true,
 		    dataIndex: 'washTime'
 		},{
-			header: '状态',
-			width : 60,
+			header: '回收人',
+			width : 80,
 			align:'center',
 		    sortable: true,
-		    dataIndex: 'status'
+			hidden:!sstsConfig.showRecyclingPeopleColumnInPackingTasksList,
+		    dataIndex: 'recyclingUser'
 		},{
 			header: '回收时间',
 			width : 110,
 			align:'center',
 		    sortable: true,
 		    dataIndex: 'dateTime'
+		},{
+			header: '状态',
+			width : 60,
+			align:'center',
+		    sortable: true,
+		    dataIndex: 'status'
 		}
 	];
 	if(sstsConfig.enablePackingSerialNum){
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
===================================================================
diff -u -r31926 -r32294
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js	(.../config.js)	(revision 31926)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js	(.../config.js)	(revision 32294)
@@ -221,5 +221,8 @@
   enableInstrumentSetTypeSetting:true,
   //启用忘记密码的功能
   enableForgotPasswordFunction:true,
+  //待装配物品列表显示回收人列
+  showRecyclingPeopleColumnInPackingTasksList:true,
+  //用户登录成功后如果检查密码到不符合复杂度要求，则强制用户修改密码
   forceUserChangePwdWhenNotMeetPwdComplexityReq:true
 }
\ No newline at end of file