From 60784a329fd3cf9f4b6a75b8dc39ff79bd907dc6 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期三, 02 三月 2022 09:16:40 +0800 Subject: [PATCH] Merge branch 'hemenkou_dev' into dev --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java index 4c0a7d4..d2b85a3 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java @@ -196,7 +196,7 @@ * @param status * @return 活动列表 */ - R listActivity(Long userId, Integer status); + R listActivity(Long userId, Integer status,Integer type); /** * 查询志愿者参与的所有已经完成的活动 -- Gitblit v1.7.1