Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7

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

@@ -21,4 +21,6 @@
    void updateEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo);

    void deleteEmergencyPlan(Long planId);

    void updateAbolish(Long id, Boolean abolishStatus);
}