Merge branch 'hemenkou_dev' into dev

101captain

2022-03-03 ae812df91394e0f3ee628ff5dbd5c54f6d6a3743

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -1148,7 +1148,7 @@
     * @return 活动列表
     */
    @PostMapping("listactivity")
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type",required = false)Integer type);

    /**
     * 用户确认心愿
@@ -9329,4 +9329,7 @@
     */
    @PostMapping("/fms/service/defaultPraise")
    R timedTaskFmsServiceDefaultPraise();

    @GetMapping("/activity/partyMemberCount")
    R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year);
}