From 24e21f8ce1a28a78a58f9a95cc6438b4a9c737a6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 11:09:54 +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