From 6bc568611d0430c94f30e41736d7809e32a64273 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 11 九月 2024 15:18:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/dto/response/warehouse/WarehouseLocationDTO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/warehouse/WarehouseLocationDTO.java b/src/main/java/com/mzl/flower/dto/response/warehouse/WarehouseLocationDTO.java
index c5fb855..98d2fc9 100644
--- a/src/main/java/com/mzl/flower/dto/response/warehouse/WarehouseLocationDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/warehouse/WarehouseLocationDTO.java
@@ -28,7 +28,7 @@
     @ApiModelProperty("是否已占用")
     private Boolean used;
 
-    private OrderDTO orderDTO;
+    private List<OrderDTO> orderDTO;
 
-    private List<OrderItemListDTO> items;
+
 }

--
Gitblit v1.9.3