Merge branch 'buttonmodify' into feature/订单服务单代码改造

xiaoyong931011

2022-03-25 7f4157d6a4983fa57c212e1286181d0d292c78d3

 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)){