Merge remote-tracking branch 'origin/master'

JiangYouYao

2022-03-15 bbc374ae6a80b111bb9d3056a065d8c5f6cd143e

 zq-erp/src/main/java/com/matrix/system/hive/dto/AchieveNewStatisticsDto.java

@@ -25,6 +25,10 @@
    //订单类型
    String orderType;

    String beginTimeStr;

    String endTimeStr;

    @Override
    public void setSort(String sort) {
        if(StringUtils.isNotBlank(sort)){