From 3389e27613953cf3d7d06653139bf902e08736dc Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 22 十月 2021 13:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
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