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

maven

昨天 55c4143362c7df1ece4523597e26947d35e21bda

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