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

huanghongfa

2021-09-06 9fb365a6bb2a7cb583627056ded7a075a5506da3

 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;

}