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

gongchunyi

5 天以前 2d1e904f3049218474318cb1e2fe5c3a3869cfb0

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