From e941512cb0145a11421ef4cf44bfe2c52cf84aa6 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 19 一月 2026 09:58:42 +0800
Subject: [PATCH] fix: 新增和更新时校验会议室时间占用冲突

---
 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