From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Wed, 21 Sep 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java
index d95e586..afcdf3b 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java
@@ -36,7 +36,7 @@
* 事故快报新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addAccidentExpress(Authentication authentication, @RequestBody AccidentExpressReqDTO AccidentExpressReqDTO) {
+ public ResultVO<AccidentExpressDetailRespDTO> addAccidentExpress(Authentication authentication, @RequestBody AccidentExpressReqDTO AccidentExpressReqDTO) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
return accidentExpressService.addAccidentExpress(currentUser, AccidentExpressReqDTO);
}
@@ -87,8 +87,8 @@
* 事故快报伤亡人员删除
*/
@RequestMapping(value = "/casualty/del/{accidentExpressId}",method = RequestMethod.GET)
- public ResultVO delAccidentExpressCasualty(@PathVariable("accidentExpressId")Long accidentExpressId){
- return accidentExpressService.delAccidentExpressCasualty(accidentExpressId);
+ public ResultVO delAccidentExpressCasualty(@PathVariable("accidentExpressId")Long id){
+ return accidentExpressService.delAccidentExpressCasualty(id);
}
}
--
Gitblit v1.9.2