From 3880af689ddab738d75a72c1e9870a9a0690919e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 12 五月 2022 11:13:15 +0800
Subject: [PATCH] 花城E+防疫修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
index 2c7aa83..ad72646 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
@@ -4,6 +4,7 @@
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.listen.ComActSocialWorkerExcelListen;
 import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
 import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
@@ -97,7 +98,7 @@
      */
     @GetMapping("/{id}")
     @ApiOperation(value = "查询社工详细信息")
-    R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
+    R<ComActSocialWorkerVO> details(@PathVariable("id") Long id){
         return communityService.comActSocialWorkerDetails(id);
     }
 
@@ -128,5 +129,10 @@
 //    public R getTemplate(){
 //        return R.ok(comactsocialworkerUrl);
 //    }
+    @ApiOperation("根据社工获取活动")
+    @PostMapping("/activityList")
+    R activityList(@RequestBody CommonPage commonPage){
+        return communityService.activityList(commonPage);
+    }
 
 }
\ No newline at end of file

--
Gitblit v1.7.1