Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-19 ab2b3291cb9e21885ed878d60f5afd6640d830f3

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

@@ -8,7 +8,7 @@
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecutePageRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteRPCQuery;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;

import java.util.List;

@@ -24,5 +24,4 @@

    ResultVO batchDeleteEmergencyDrillExecute(Long[] ids);

    ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(EmergencyDrillExecuteRPCQuery query);
}