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

zhangfeng

2022-11-08 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillPlanService.java

@@ -20,5 +20,5 @@

    ResultVO updateEmergencyDrillPlan(Long uid, EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO);

    ResultVO batchDeleteEmergencyDrillPlan(String ids);
    ResultVO batchDeleteEmergencyDrillPlan(Long[] ids);
}