Merge remote-tracking branch 'origin/master' into master

songhuangfeng123

2022-08-12 5ed84eaec030109b0e6b77ae2667ed56e959871b

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

@@ -44,5 +44,10 @@
        emergencyPlanInfoRepository.deleteEmergencyPlan(planId);
    }

    @Override
    public void updateAbolish(Long id, Boolean abolishStatus) {
        emergencyPlanInfoRepository.updateAbolish(id,abolishStatus);
    }


}