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

gongchunyi

2026-05-22 bbd9823e935293b4815963647fecf48e3ba7ee1b

 src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java

@@ -21,7 +21,7 @@
public interface WarehouseGoodsShelvesMapper extends BaseMapper<WarehouseGoodsShelves> {

    List<WarehouseGoodsShelvesDto> findList(@Param("warehouseGoodsShelves") WarehouseGoodsShelves warehouseGoodsShelves);
    List<WarehouseGoodsShelves> listAll(@Param("warehouseGoodsShelves") WarehouseGoodsShelves warehouseGoodsShelves);
    List<WarehouseGoodsShelvesDto> listAll(@Param("warehouseGoodsShelves") WarehouseGoodsShelves warehouseGoodsShelves);
}