Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/service/EmergencyRepairService.java

@@ -312,7 +312,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         if (!re) {
             return RestResponse.fail("修改急修失败，请稍后重试");
         }
-        boolean er = erRecordCostService.saveBatch(erRecordCosts);
+        boolean er = erRecordCostService.saveOrUpdateBatch(erRecordCosts);
         if (er) {
             List<EmergencyHistory> histories = new ArrayList<>();
             for (ErRecordCost erRecordCost : erRecordCosts) {
@@ -326,7 +326,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
                 history.setOperateDate(LocalDateTime.now());
                 histories.add(history);
             }
-            boolean his = emergencyHistoryService.saveBatch(histories, histories.size());
+            boolean his = emergencyHistoryService.saveOrUpdateBatch(histories, histories.size());
             if(his){
                 return RestResponse.success(true);
             }else{