From d001341d0e0b4fa9bc09dbd0ef3abe8947f81717 Mon Sep 17 00:00:00 2001 From: 彭雪彬 <1724387007@qq.com> Date: Tue, 15 Jul 2025 16:39:27 +0800 Subject: [PATCH] Merge branch 'xin' into pxb --- oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml index de091c0..43c48db 100644 --- a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml +++ b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml @@ -58,7 +58,7 @@ <sql id="Base_Column_List"> o.return_id, o.return_num, o.return_status, o.return_status_describe, o.order_num, o.order_store_num, - o.order_time, o.send_time, o.send_type, o.pay_type, o.user_id, o.username, o.store_id, o.store_name, o.store_logo, + o.order_time, o.send_price, o.send_type, o.pay_type, o.user_id, o.username, o.store_id, o.store_name, o.store_logo, o.original_price order_original_price, o.paid_price order_paid_price, o.actually_pay_price order_actually_pay_price, o.refund_price, o.refund_status, o.success_time, o.channel, o.reason, o.remark, o.photos, o.audit_status, o.audit_user, o.audit_time, o.audit_message, o.rider_id, o.rider_phone, o.rider_name, -- Gitblit v1.9.3