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

tangxiaobao

2021-09-09 67494eba4305d6e5c95079d17c5b6bcd8489df82

 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;

}