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/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java index 9e3167e..7c90fe0 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java @@ -238,13 +238,15 @@ @ApiOperation(value = "活动签到记录", response = ComActActRegistVO.class) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "活动主键", required = true), - @ApiImplicitParam(name = "type", value = "活动类型,1.居民/志愿者活动 2.党员活动", required = true) + @ApiImplicitParam(name = "type", value = "活动类型,1.居民/志愿者活动 2.党员活动", required = true), + @ApiImplicitParam(name = "userId", value = "用户id", required = true) }) @GetMapping("activity/regist/list") public R listRegistRecord(@RequestParam("id") Long id, - @RequestParam("type") Integer type) { + @RequestParam("type") Integer type, + @RequestParam("userId") Long userId) { if (type.intValue() == 1) { - return communityService.listRegistRecord(id, this.getUserId()); + return communityService.listRegistRecord(id, userId); } return R.fail("type不存在"); } -- Gitblit v1.7.1