Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r14859 -r14860
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14859)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14860)
@@ -2808,8 +2808,6 @@
 			}
 			
 			isNeedToBeMerged = isApplicationFormMerge(recyclingApplication,supplyRoomConfig, autoMerge);
-			// 申请时间
-			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 			
 			if (isNeedToBeMerged) {
 				existApplication = getSameStatusRecyclingApplication(recyclingApplication,isCommit);
@@ -2822,7 +2820,7 @@
 					// 设置被合并申请单的最后修改时间
 					existApplication.setSubmitTime(modifyTime);
 					
-					String modifyTimeString = dateFormat.format(modifyTime);
+					String modifyTimeString = com.forgon.Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(modifyTime);
 					String remarkNeedToBeAdded = "——被 "
 							+ recyclingApplication.getApplicant()
 							+ " 于"