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

zss

3 天以前 6ed4b397bb9dbb9c2d7bb0676339721fa97996bf

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

@@ -6,8 +6,7 @@

public class WarehouseGoodsShelvesDto extends WarehouseGoodsShelves {
    private String warehouseName;
    private String goodsShelvesName;
//    private List<DocumentationDto> documentationList;
    private List<WarehouseGoodsShelvesRowcolDto> warehouseGoodsShelvesRowcolList;
    private String docName;
    private String docNumber;
    private String category;
}