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

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

diff --git a/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderStationQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderStationQueryDTO.java
index e503680..19217da 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderStationQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderStationQueryDTO.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class DeliveryOrderStationQueryDTO {
@@ -34,9 +35,15 @@
     @ApiModelProperty(value = "库位名称")
     private String warehouseLocationCode;
 
+    @ApiModelProperty(value = "日期")
+    private String date;
+
     @ApiModelProperty(hidden = true)
     private LocalDateTime startDate;
 
     @ApiModelProperty(hidden = true)
     private LocalDateTime endDate;
+
+    @ApiModelProperty(hidden = true)
+    private List<String> statusList;
 }

--
Gitblit v1.9.3