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

zss

2026-04-23 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2

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