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/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
index 6fe4731..a416e67 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -340,10 +340,12 @@
      *            用户id
      * @param communityId
      *            社区id 同一用户在不同社区都是党员
+     * @param status
      * @return 党建活动列表
      */
     @PostMapping("/partybuildIng/listactivity")
-    R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+    R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId,
+                   @RequestParam(value = "status", required = false) Integer status);
 
     /**
      * 党员活动人员参入列表

--
Gitblit v1.7.1