From 51eac60f5d04af43f93590ad2219f9bdda313745 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 25 十二月 2024 11:11:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/request/statisticAnalysis/FlowerSaleDTO.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/statisticAnalysis/FlowerSaleDTO.java b/src/main/java/com/mzl/flower/dto/request/statisticAnalysis/FlowerSaleDTO.java
index 18ea733..7d97957 100644
--- a/src/main/java/com/mzl/flower/dto/request/statisticAnalysis/FlowerSaleDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/statisticAnalysis/FlowerSaleDTO.java
@@ -66,9 +66,14 @@
@ApiModelProperty(value = "创建时间-结束；yyyy-MM-dd")
private String createEndDateStr;
- @ApiModelProperty(hidden = true)
+
private LocalDateTime createStartDate;
- @ApiModelProperty(hidden = true)
+
private LocalDateTime createEndDate;
+
+ @ApiModelProperty(value = "排序字段")
+ private String orderField;
+ @ApiModelProperty(value = "排序类型，ASC 升序，DESC 降序")
+ private String orderType;
}
--
Gitblit v1.9.3