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

songhuangfeng123

2022-08-12 5ed84eaec030109b0e6b77ae2667ed56e959871b

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java

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

    void deleteEmergencyPlan(@Param("id")Long id);

    void updateAbolish(@Param("id")Long id,@Param("abolishStatus") Boolean abolishStatus);
}