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

huanghongfa

2021-07-22 3197770b87a7046e02655bea51034abdfa09ed6d

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

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

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

    @ApiModelProperty("话题名称")
    private String topicName;

}