From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java
index 029c18e..6bcec87 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java
@@ -3,8 +3,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
-import com.panzhihua.common.model.vos.sanshuo.ComEventRequestVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventVO;
+import com.panzhihua.common.model.vos.sanshuo.ComSanRequestVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +23,7 @@
* @date 2022-09-07 11:23:51
*/
@PostMapping("/add")
- R insertComEvent(@RequestBody ComEventRequestVO comEventVO);
+ R insertComEvent(@RequestBody ComSanRequestVO comEventVO);
/**
* description 更新三说会堂事件表
@@ -93,7 +93,7 @@
* @date 2022-09-07 11:23:51
*/
@DeleteMapping("/remove/{id}")
- R remove(@PathVariable Long id);
+ R remove(@PathVariable(value = "id") Long id);
/**
* description 修改三说会堂事件表状态
@@ -127,7 +127,7 @@
* @date 2022-09-07 11:23:51
*/
@PutMapping("/accept/Request")
- R acceptRequest(@RequestParam("id") Long id, @RequestParam("specialistId") Long specterId);
+ R acceptRequest(@RequestParam("id") Long id, @RequestParam("specterId") Long specterId);
/**
* description 修改三说会堂事件表状态
@@ -180,6 +180,6 @@
* @author manailin
* @date 2022-09-07 11:23:51
*/
- @PutMapping("/status/calculate")
+ @GetMapping("/status/calculate")
R calculate();
}
--
Gitblit v1.7.1