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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 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;
}