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 |    3 +++
 1 files changed, 3 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 a6fb34e..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
@@ -33,4 +33,7 @@
 //    @NotNull(message = "下单日期不能为空")
     private LocalDate calDate;
 
+    @ApiModelProperty(value = "是否是合伙人,默认0")
+    private Integer partnerFlag;
+
 }

--
Gitblit v1.9.3