Merge branch 'master' into test

CeDo

2021-06-17 1c8ed0e3e18d6ed97879cb2925db914a9d487314

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java

@@ -86,6 +86,9 @@
    @ApiModelProperty("社区id")
    private Long communityId;

    @ApiModelProperty("社区名称")
    private String communityName;

    @ApiModelProperty("活动党员列表")
    private List<PartyBuildingMemberVO> partyBuildingMemberVOS;