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

songhuangfeng123

2022-09-19 ab2b3291cb9e21885ed878d60f5afd6640d830f3

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

@@ -16,7 +16,7 @@

    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);

@@ -28,5 +28,5 @@

    ResultVO addAccidentExpressCasualty(Long uid, AccidentExpressCasualtyReqDTO accidentExpressCasualtyReqDTO);

    ResultVO delAccidentExpressCasualty(Long accidentExpressId);
    ResultVO delAccidentExpressCasualty(Long id);
}