From 0d5b156f0f2c48a06974361532b7505e92db633b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 05 十一月 2021 10:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index e717966..23e1580 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -257,7 +257,7 @@
         Long userId = loginUserInfo.getUserId();
         Long communityId = loginUserInfo.getCommunityId();
         List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
-        R r = communityService.listActivity(userId, status);
+        R r = communityService.listActivity(userId);
         if (R.isOk(r)) {
             comActActivityVOS = (List<ComActActivityVO>)r.getData();
         }

--
Gitblit v1.7.1