From ab2b3291cb9e21885ed878d60f5afd6640d830f3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 19 九月 2022 18:05:24 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
index 8fc14ef..6e32171 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
+++ b/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);

--
Gitblit v1.9.2