Merge branch 'zzj' into 'test'

罗元桥

2021-09-03 6cee6c4b10cb4bc97f8fb514bb1f55b66d1a84fa

 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;

}