From ac135b66a5ab9f2f74c55961066974e815b88e9a Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 04 九月 2025 16:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_ywx' into pim_ywx

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

diff --git a/src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java b/src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java
index 6e68368..d02e0cd 100644
--- a/src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java
+++ b/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);
 }
 
 

--
Gitblit v1.9.3