From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java b/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java
index a1cd010..622d8e1 100644
--- a/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java
+++ b/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java
@@ -23,5 +23,5 @@
 
     boolean deleteByIds(List<Long> ids);
 
-    List<WarehouseGoodsShelves> findList(WarehouseGoodsShelves warehouseGoodsShelves);
+    List<WarehouseGoodsShelvesDto> findList(WarehouseGoodsShelves warehouseGoodsShelves);
 }

--
Gitblit v1.9.3