Merge branch 'zhaozhengjie1104'

101captain

2021-11-08 8e24df7313c4d9648bd85b4cf0e1f997e31e6bc3

 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;

}