Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r14850 -r14859
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14850)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14859)
@@ -2752,8 +2752,7 @@
 
 	private boolean isApplicationFormMerge(
 			RecyclingApplication recyclingApplication,
-			SupplyRoomConfig supplyRoomConfig, boolean autoMerge,
-			boolean isNeedToBeMerged) {
+			SupplyRoomConfig supplyRoomConfig, boolean autoMerge) {
 		
 		//是否二级供应室
 		boolean isSupplyRoom2 = false;
@@ -2808,7 +2807,7 @@
 				isNeedToBeMerged = true;
 			}
 			
-			isNeedToBeMerged = isApplicationFormMerge(recyclingApplication,supplyRoomConfig, autoMerge, isNeedToBeMerged);
+			isNeedToBeMerged = isApplicationFormMerge(recyclingApplication,supplyRoomConfig, autoMerge);
 			// 申请时间
 			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");