Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java

@@ -646,15 +646,17 @@ public class AftersalesWorkOrderController extends BladeController {
 //				throw new ServiceException("二级品类未填！");
 //			}
 		}
-		try {
+		aftersalesWorkOrder.setInitiationIdentification("PC");
-			aftersalesWorkOrder.setInitiationIdentification("PC");
+		return R.status(aftersalesWorkOrderService.saveOrUpdateOwn(aftersalesWorkOrder));
-			return R.status(aftersalesWorkOrderService.saveOrUpdateOwn(aftersalesWorkOrder));
+//		try {
-		}catch (ServiceException s){
+//
-			return R.fail(s.getMessage());
+//		}catch (ServiceException s){
-		}catch (Exception e){
+//			return R.fail(s.getMessage());
-			log.error("工单提交异常》》》{}",e.getMessage());
+//		}
-			return R.fail("系统异常！！！");
+//		catch (Exception e){
-		}
+//			log.error("工单提交异常》》》{}",e.getMessage());
+//			return R.fail("系统异常！！！");
+//		}
 
 	}