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/payment/OrderQueryDTO.java | 21 +++++++++++++++++++++
1 files changed, 21 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..5d8126c 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,25 @@
@ApiModelProperty(hidden = true)
private List<String> idList;
+
+ @ApiModelProperty(value = "收货地址详细地址（拼接省市区地址）")
+ private String address;
+
+ @ApiModelProperty(hidden = true)
+ private boolean customerQuery = false;
+
+ @ApiModelProperty(value = "库位")
+ private String warehouseLocationCode;
+
+ @ApiModelProperty(value = "用户账号")
+ private String createName;
+
+ @ApiModelProperty("服务区域-省")
+ private String province;
+
+ @ApiModelProperty("服务区域-市")
+ private String city;
+
+ @ApiModelProperty("服务区域-区")
+ private String region;
}
--
Gitblit v1.9.3