From b1bef8fac3c0553f87b7047673123b23b68daa49 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 十二月 2024 11:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 e55da06..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
@@ -30,7 +30,10 @@
@ApiModelProperty(value = "下单日期")
@JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd")
- @NotNull(message = "下单日期不能为空")
+// @NotNull(message = "下单日期不能为空")
private LocalDate calDate;
+ @ApiModelProperty(value = "是否是合伙人，默认0")
+ private Integer partnerFlag;
+
}
--
Gitblit v1.9.3