Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-03-17 9974b1fffff1cad712b7c30fb4c708ef45ec4b8c

 zq-erp/src/main/java/com/matrix/core/pojo/BasePageQueryDto.java

@@ -26,7 +26,7 @@
    private String order;

    @ApiModelProperty(value ="排序字段", example = "create_time")
    private String sortField;
    private String sort;

    @ApiModelProperty(value ="关键字")
    private String keywords;