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/EmergencyPlanInfoService.java

@@ -17,4 +17,10 @@
    void addEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo);

    EmergencyPlanInfoDetailDO selectEmergencyPlanById(Long id);

    void updateEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo);

    void deleteEmergencyPlan(Long planId);

    void updateAbolish(Long id, Boolean abolishStatus);
}