From ebce471ec71ea6acdef92b4316d12e62ae223512 Mon Sep 17 00:00:00 2001
From: zjj <zjj123>
Date: 星期一, 29 九月 2025 13:42:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/integrationWms' into integrationWms

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

diff --git a/src/main/resources/mapper/BasWhsMapper.xml b/src/main/resources/mapper/BasWhsMapper.xml
index 2017ad2..75cfecc 100644
--- a/src/main/resources/mapper/BasWhsMapper.xml
+++ b/src/main/resources/mapper/BasWhsMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.zy.asrs.mapper.BasWhsMapper">
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWhs">
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWhsType">
         <id column="id" property="id" />
         <result column="whs_desc" property="whsDesc" />
         <result column="modi_user" property="modiUser" />
@@ -16,7 +16,7 @@
 
     <select id="selectByIdentifying" resultMap="BaseResultMap">
         select top 1 *
-        from asr_bas_whs
+        from asr_bas_whs_type
         where 1=1
         and identifying = #{identifying}
     </select>

--
Gitblit v1.9.1