Merge branch 'hemenkou_dev' into dev

101captain

2022-03-03 ae812df91394e0f3ee628ff5dbd5c54f6d6a3743

Merge branch 'hemenkou_dev' into dev

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java

@@ -122,4 +122,6 @@
    @Length(max = 30)
    @ApiModelProperty(value = "大学名称")
    private String universityName;

    private Long streetId;
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java

@@ -385,8 +385,13 @@
    @ApiOperation(value = "分页展示志愿者")
    @PutMapping("pagevolunteer")
    public R pageVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
        Long communityId = this.getCommunityId();
        comMngVolunteerMngVO.setCommunityId(communityId);
        if(this.getLoginUserInfo().getStreetId()!=null){
            comMngVolunteerMngVO.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            comMngVolunteerMngVO.setCommunityId(this.getCommunityId());
        }

        return communityService.pageVolunteer(comMngVolunteerMngVO);
    }