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

songhuangfeng123

2022-08-15 c9529bd19a8d61666b71824dd751682c1e9dc288

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java

@@ -16,13 +16,13 @@

    SearchResultVO<List<AccidentExpressPageRespDTO>> selectAccidentExpressList(PageQuery<AccidentExpressQuery> query);

    ResultVO addAccidentExpress(ContextCacheUser contextCacheUser, AccidentExpressReqDTO AccidentExpressReqDTO);
    ResultVO<AccidentExpressDetailRespDTO> addAccidentExpress(ContextCacheUser contextCacheUser, AccidentExpressReqDTO AccidentExpressReqDTO);

    ResultVO<AccidentExpressDetailRespDTO> getAccidentExpressById(Long id);

    ResultVO updateAccidentExpress(Long uid, AccidentExpressReqDTO AccidentExpressReqDTO);

    ResultVO batchDeleteAccidentExpress(String ids);
    ResultVO batchDeleteAccidentExpress(Long[] ids);

    ResultVO selectAccidentExpressCasualtyList(Long accidentExpressId);