From 5929fa552fd2d8cf9d4cad0d519c89728e4a6ada Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 23 三月 2026 16:03:16 +0800
Subject: [PATCH] Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_衡阳_鹏创电子

---
 src/main/resources/mapper/warehouse/WarehouseMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/warehouse/WarehouseMapper.xml b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
index 4ccb3fe..dd45695 100644
--- a/src/main/resources/mapper/warehouse/WarehouseMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
@@ -8,7 +8,7 @@
     <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseDto">
         SELECT
         w.*,
-        wgs.goods_shelves_name,
+        wgs.name,
         doc.doc_name,
         doc.doc_number,
         dc.category

--
Gitblit v1.9.3