Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 5ccc656f6ed10aaf14b662c3392b07e99b9016e0

 flower_city/src/main/java/com/dg/core/db/manual/pojo/QueryResults.java

@@ -25,4 +25,7 @@
    @ApiModelProperty("联想词列表")
    private  List<KeywordEntity> keywordEntityList;

    @ApiModelProperty("关联联想词列表")
    private  List<KeywordEntity> keywordAssociationList;

}