From 58c5d6244a120d9d169206f9c5dfc1ae7073909f Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sun, 4 Jan 2026 18:22:50 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=E8=BF=90=E5=8D=95=E8=A1=A5?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E8=A7=A3=E5=86=B3=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/EmisWaybillMapper.xml   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 3d8df9647..e56704a08 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillMapper">
 
-    <resultMap type="EmisWaybill" id="BaseEmisWaybillResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWaybill" id="BaseEmisWaybillResult">
         <result property="id"    column="id"    />
         <result property="orderSn"    column="order_sn"    />
         <result property="custOrderId"    column="cust_order_id"    />
@@ -241,6 +241,15 @@
         <result property="salesSupport"    column="sales_support"    />
         <result property="salesExecutive"    column="sales_executive"    />
 
+        <!-- BaseEntity 字段映射 -->
+        <result property="remark"    column="remark"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createSite"    column="create_site"    />
+        <result property="updateSite"    column="update_site"    />
 
     </resultMap>