From f0da95925bcb8ad19b0d1cc78afe4b4a4ae188a6 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 28 八月 2025 09:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/resources/mapper/ApprovalRecordMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/ApprovalRecordMapper.xml b/src/main/resources/mapper/ApprovalRecordMapper.xml
index 11d9bae..bc7571b 100644
--- a/src/main/resources/mapper/ApprovalRecordMapper.xml
+++ b/src/main/resources/mapper/ApprovalRecordMapper.xml
@@ -30,8 +30,8 @@
<select id="selectApprovalRecordPage" resultMap="BaseResultMap">
SELECT ar.<include refid="Base_Column_List"/>
- FROM approval_record ar
- LEFT JOIN order_info oi ON ar.order_id = oi.order_id
+ FROM tb_approval_record ar
+ LEFT JOIN tb_order_info oi ON ar.order_id = oi.order_id
WHERE ar.deleted = 0
<if test="orderId != null and orderId != ''">
AND ar.order_id = #{orderId}
@@ -80,15 +80,15 @@
<select id="selectByOrderId" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"/>
- FROM approval_record
+ FROM tb_approval_record
WHERE deleted = 0 AND order_id = #{orderId}
ORDER BY created_at ASC
</select>
<select id="selectPendingApprovalPage" resultMap="BaseResultMap">
SELECT ar.<include refid="Base_Column_List"/>
- FROM approval_record ar
- LEFT JOIN order_info oi ON ar.order_id = oi.order_id
+ FROM tb_approval_record ar
+ LEFT JOIN tb_order_info oi ON ar.order_id = oi.order_id
WHERE ar.deleted = 0 AND ar.approval_result IS NULL
<if test="orderId != null and orderId != ''">
AND ar.order_id = #{orderId}
--
Gitblit v1.8.0