From ae9c2b4c7f1f1577584beb5a9d31f4fa69ab47ff Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 27 九月 2024 16:26:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java
index d271a9a..4086af8 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java
@@ -70,4 +70,13 @@
 
     @ApiModelProperty(hidden = true)
     private List<String> idList;
+
+    @ApiModelProperty(value = "收货地址详细地址(拼接省市区地址)")
+    private String address;
+
+    @ApiModelProperty(hidden = true)
+    private boolean customerQuery = false;
+
+    @ApiModelProperty(value = "库位")
+    private String warehouseLocationCode;
 }

--
Gitblit v1.9.3