From 81e00cd2e26e387d8ab2077ccd982072d6eb865b Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 15:40:31 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
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