From ded338d0bafa5594b275edb81a8f69ea4446c37c Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 06 一月 2026 15:02:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
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