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

manailin

2021-06-27 76ed3735c23da4b7ef97b8a0f365facbc14f6903

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

@@ -33,4 +33,10 @@
    @ApiModelProperty("议事主题")
    private String releaseContent;

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

    @ApiModelProperty(value="发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
    private Integer status;

}