Merge branch 'test' into 'test_bak'

罗元桥

2021-09-29 a777cbf23ac54f9e2c24bdbad102d45deb0b06b1

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

@@ -42,4 +42,7 @@
    @ApiModelProperty("话题名称")
    private String topicName;

    @ApiModelProperty("关键词")
    private String keyWord;

}