From 75206d4e4ecd2a7789a21362b85906463d3f2c3d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 27 十二月 2021 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' into hemenkou_dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
index 2aad1b2..817b1e6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -468,8 +468,10 @@
      * @return 党建活动列表
      */
     @PostMapping("listactivity")
-    public R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
-        return comBpActivityService.listActivity(userId, communityId);
+    public R listActivity(@RequestParam("userId") Long userId,
+                          @RequestParam("communityId") Long communityId,
+                          @RequestParam(value = "status", required = false) Integer status) {
+        return comBpActivityService.listActivity(userId, communityId, status);
 
     }
 

--
Gitblit v1.7.1