From ca4034c3a285f2c22fa19e5eaa88d505b5588c0b Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 29 十二月 2021 10:48:40 +0800
Subject: [PATCH] Merge branch 'master' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index a087a2c..b748423 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -7680,4 +7680,36 @@
      */
     @PostMapping("/screen/index/questionnaireList")
     R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 首页二级页面-居民活动
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/residentAct")
+    R indexResidentAct(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-居民活动展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/index/residentActList")
+    R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 首页二级页面-志愿者活动
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/volunteerAct")
+    R indexVolunteerAct(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-志愿者活动展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/index/volunteerActList")
+    R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO);
 }

--
Gitblit v1.7.1