Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into dat...

wzy

2021-03-25 1b51c3e64ba8117900d594fcd5b677336e4759bc

 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;