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

CeDo

2021-06-17 0f5336c2b54e771eecb62dabd6f55359b491cb68

 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;

}