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

manailin

2021-07-08 7eedb5a250515610f1df1fa0730cf779f0525add

 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;

}