Merge remote-tracking branch 'origin/master-v2' into master-v2

Cui Zhi Feng

2024-09-10 b27420f3e0cbb0de34c34ddd308dd4baf7d4b225

 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;

}