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

huanghongfa

2021-09-22 245eb51063dca6bcb9c67c5b4b400b6f2b04453a

 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;

}