From 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 11:39:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
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