Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-08-15 c9529bd19a8d61666b71824dd751682c1e9dc288

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java

@@ -102,6 +102,7 @@
        emergencyPlanInfo.setDelFlag(false);
        emergencyPlanInfo.setCreateUid(uid);
        emergencyPlanInfo.setGmtCreate(nowDate);
        emergencyPlanInfo.setAbolishStatus(false);
        emergencyPlanInfoService.addEmergencyPlan(emergencyPlanInfo);
        // 新增应急预案区域表
        if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())) {