From 2116b5b5802c0de0f126f85cf2ac56a732639e82 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:39:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
index 9ba307f..2826d0b 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
@@ -7,6 +7,8 @@
<result column="order_num" property="orderNum"/>
<result column="user_id" property="userId"/>
<result column="store_id" property="storeId"/>
+ <result column="store_name" property="storeName"/>
+ <result column="store_logo" property="storeLogo"/>
<result column="original_price" property="originalPrice"/>
<result column="paid_price" property="paidPrice"/>
<result column="actually_pay_price" property="actuallyPayPrice"/>
@@ -15,6 +17,9 @@
<result column="success_time" property="successTime"/>
<result column="channel" property="channel"/>
<result column="reason" property="reason"/>
+ <result column="remark" property="remark"/>
+ <result column="photos" property="photos"/>
+ <result column="audit_status" property="auditStatus"/>
<result column="audit_user" property="auditUser"/>
<result column="audit_time" property="auditTime"/>
<result column="audit_message" property="auditMessage"/>
@@ -25,7 +30,7 @@
</resultMap>
<sql id="Base_Column_List">
- return_id, return_num, order_num, user_id, store_id, original_price, paid_price, actually_pay_price, refund_price, refund_status, success_time, channel, reason, audit_user, audit_time, audit_message, create_by, create_time, update_by, update_time
+ return_id, return_num, order_num, user_id, store_id, store_name, store_logo, original_price, paid_price, actually_pay_price, refund_price, refund_status, success_time, channel, reason, remark, photos, audit_status, audit_user, audit_time, audit_message, create_by, create_time, update_by, update_time
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -63,4 +68,4 @@
</where>
order by return_id desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3