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

CeDo

2021-06-04 c7c38dfd96047930999bcd7cf62d18d6d8651108

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java

@@ -34,6 +34,6 @@
    private String releaseContent;

    @ApiModelProperty(value = "社区id",hidden = true)
    private String communityId;
    private Long communityId;

}