| 
														
															@@ -233,7 +233,7 @@ public class OrderBaseLogic { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         orderBase.setIsQdNotice(true); 
														 | 
														
														 | 
														
															         orderBase.setIsQdNotice(true); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         orderBase.setId(orderBaseId); 
														 | 
														
														 | 
														
															         orderBase.setId(orderBaseId); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         orderBase.setIsImportExcel(orderBase.getIsImportExcel() != null?old.getIsImportExcel():false); 
														 | 
														
														 | 
														
															         orderBase.setIsImportExcel(orderBase.getIsImportExcel() != null?old.getIsImportExcel():false); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        orderBase.setIsMeet(orderAddBeanDTO.getIsMeet()); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        orderBase.setIsMeet(orderBase.getIsImportExcel()?orderAddBeanDTO.getIsMeet():true); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															         //是否变更了师傅 
														 | 
														
														 | 
														
															         //是否变更了师傅 
														 |