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

huanghongfa

2022-04-14 cb2b53c615599ae0ca50fbdaa2de83be047c94fe

 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;

}