From c9529bd19a8d61666b71824dd751682c1e9dc288 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 15 八月 2022 10:39:31 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master

---
 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 5140b53..7383f51 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);
     }
@@ -61,8 +61,8 @@
     /**
      * 事故快报删除/批量删除
      */
-    @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
-    public ResultVO batchDeleteAccidentExpress(@PathVariable("ids")String ids){
+    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+    public ResultVO batchDeleteAccidentExpress(@RequestBody Long[] ids){
         return accidentExpressService.batchDeleteAccidentExpress(ids);
     }
 

--
Gitblit v1.9.2