From 58a8acceb63d52377da4b837e859f2e03d2bce1b Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 14 十月 2024 08:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v3' into master-v2
---
src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java b/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java
index f35960b..64ed2ad 100644
--- a/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java
@@ -26,4 +26,14 @@
@ApiModelProperty(value = "合伙人id")
private Long partnerId;
+
+ @ApiModelProperty(value = "下单日期")
+ @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+// @NotNull(message = "下单日期不能为空")
+ private LocalDate calDate;
+
+ @ApiModelProperty(value = "是否是合伙人，默认0")
+ private Integer partnerFlag;
+
}
--
Gitblit v1.9.3