From 55db77e61e5a55c30dc19d599dadcfc1469c962e Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期日, 08 九月 2024 16:13:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' 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