From c4409fac0044cc1efeda07b6a7709c3fde1aa9fe Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期六, 24 十月 2026 10:46:32 +0800
Subject: [PATCH] fix(仓储物流): ①出库新增临时跳过租户插件修复 SetOperationList 解析异常 ②库存预警查询补 warningLevel/warningStatus/warningTime/expectedShortageTime/suggestionType/suggestionContent 字段 ③currentStock 别名

---
 src/main/resources/mapper/approve/ApproveLogMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/approve/ApproveLogMapper.xml b/src/main/resources/mapper/approve/ApproveLogMapper.xml
index e47dbbc..1ea3242 100644
--- a/src/main/resources/mapper/approve/ApproveLogMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveLogMapper.xml
@@ -7,15 +7,19 @@
     <resultMap id="BaseResultMap" type="com.ruoyi.approve.pojo.ApproveLog">
             <id property="id" column="id" />
             <result property="approveId" column="approve_id" />
+            <result property="approveProcessId" column="approve_process_id" />
+            <result property="approveNodeId" column="approve_node_id" />
             <result property="approveNodeOrder" column="approve_node_order" />
             <result property="approveUser" column="approve_user" />
+            <result property="approveUserName" column="approve_user_name" />
             <result property="approveTime" column="approve_time" />
             <result property="approveStatus" column="approve_status" />
             <result property="approveRemark" column="approve_remark" />
+            <result property="tenantId" column="tenant_id" />
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,approve_id,approve_node_order,approve_user,approve_time,approve_status,
-        approve_remark
+        id,approve_id,approve_process_id,approve_node_id,approve_node_order,approve_user,
+        approve_user_name,approve_time,approve_status,approve_remark,tenant_id
     </sql>
 </mapper>

--
Gitblit v1.9.3