From d76c9f4e730422cbe43496adfc57a6e3d36577ab Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期二, 01 三月 2022 13:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java
index acb283b..33e02ca 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java
@@ -142,11 +142,11 @@
     }
 
     /**
-     * 根据社区活动id查询社区活动报名人员列表
+     * 根据社区活动id查询社区活动报名且未参与人员列表
      * 
      * @param activityId
      *            活动id
-     * @return 社区活动报名人员列表
+     * @return 社区活动报名且未参与人员列表
      */
     @PostMapping("/act/activity/admin")
     public R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId) {

--
Gitblit v1.7.1