Merge remote-tracking branch 'origin/jtwy' into jtwy

liyong

23 小时以前 7558d3cb61282e41e27f85f56e829c6e6409f66d

 src/main/java/com/ruoyi/warehouse/dto/WarehouseDto.java

@@ -10,7 +10,4 @@

    private String goodsShelvesName;
    private String category;
//    private List<DocumentationDto> documentationList;
//    private List<WarehouseGoodsShelvesRowcolDto> warehouseGoodsShelvesRowcolList;
    private List<WarehouseGoodsShelvesDto> warehouseGoodsShelvesList;
}