Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-31 dde29a93461a81940dbef9a65c60fa2690f2097e

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -584,4 +584,14 @@
    public R getTotlePerson(@RequestParam(value = "param", required = false) String param, @RequestParam(value = "communityId") Long communityId){
        return comPbServiceTeamService.getTotlePerson(param,communityId);
    }

    /**
     * 根据党员活动id查询活动下报名人员
     * @param activityId    党员活动id
     * @return  活动下报名人员
     */
    @PostMapping("getTaskPbActivityPeopleList")
    public R getTaskPbActivityPeopleList(@RequestParam("activityId")Long activityId){
        return comBpActivityService.getTaskPbActivityPeopleList(activityId);
    }
}