From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 27 May 2022 19:48:02 +0800 Subject: [PATCH] Merge branch 'developer' into hive2.0 --- zq-erp/src/main/java/com/matrix/system/hive/dto/AchieveNewStatisticsDto.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dto/AchieveNewStatisticsDto.java b/zq-erp/src/main/java/com/matrix/system/hive/dto/AchieveNewStatisticsDto.java index f4b4816..25bbfcc 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/dto/AchieveNewStatisticsDto.java +++ b/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)){ -- Gitblit v1.9.1