From 984c102eb4e632985e45b7c4be1545c53c87b589 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 06 十二月 2024 21:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v5' into master-v5
---
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 ca40541..a9d3af8 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
@@ -73,4 +73,13 @@
@ApiModelProperty(value = "收货地址详细地址（拼接省市区地址）")
private String address;
+
+ @ApiModelProperty(hidden = true)
+ private boolean customerQuery = false;
+
+ @ApiModelProperty(value = "库位")
+ private String warehouseLocationCode;
+
+ @ApiModelProperty(value = "用户账号")
+ private String createName;
}
--
Gitblit v1.9.3