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

CeDo

2021-05-12 115ba80cfd41258574d0e215e427cb041e21b40f

 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;

}