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/controller/EmergencyPlanController.java

@@ -70,9 +70,6 @@
    /**
     * 应急预案废止/还原
     */
    /**
     * 应急预案详情
     */
    @RequestMapping(value = "/updateAbolish",method = RequestMethod.GET)
    public ResultVO updateAbolish(Long id ,Boolean abolishStatus){
        return emergencyPlanService.updateAbolish(id,abolishStatus);