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

huanghongfa

2021-09-13 47b20dbb8f81f2a3ac113a7e209a8b4d1cb0146d

 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;

}