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

xyh

2021-06-23 d01be9f1ec9a393818ea64deca3cbe7fa9372e08

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

@@ -36,4 +36,7 @@
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

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

}