From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerApi.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerApi.java
index 1bd6599..4d659c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerApi.java
@@ -79,7 +79,7 @@
* @return 查找结果
*/
@PostMapping("/{id}")
- R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id){
+ R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id){
return comActSocialWorkerService.comActSocialWorkerDetails(id);
}
@@ -92,4 +92,15 @@
@PostMapping("/input")
R export(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId){
return comActSocialWorkerService.export(list,communityId);
- }}
+ }
+ @PostMapping("/activity")
+ R activity(@RequestBody CommonPage commonPage){
+ return comActSocialWorkerService.activity(commonPage);
+ }
+ @PostMapping("/activityList")
+ R activityList(@RequestBody CommonPage commonPage){
+ return comActSocialWorkerService.activityList(commonPage);
+ }
+}
+
+
--
Gitblit v1.7.1