Merge branch 'master' of http://47.96.225.205:8888/r/flowerbackend-v2

cloudroam

2024-09-09 bb843532217cdf2df68f0d719612e70c599ed7d5

 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;

}