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

manailin

2021-08-04 c2197723fdd911962372c58499171d8c909b8ebc

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

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

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

}