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

zss

2026-03-06 5ea995912d4134f2027a3ddb566718f56d979261

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