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/OrderMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
index 1f46c1c..641e59f 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
@@ -60,7 +60,7 @@
 
     <sql id="Base_Column_List">
         o.order_id, o.order_num, o.order_store_num, o.order_status, o.order_status_describe,
-        o.order_remark, o.order_time, o.send_time, o.send_type, o.user_id, o.username, o.store_id,
+        o.order_remark, o.order_time, o.send_price, o.send_type, o.user_id, o.username, o.store_id,
         o.store_name, o.store_logo, o.order_describe, o.original_price order_original_price, o.paid_price order_paid_price,
         o.actually_pay_price order_actually_pay_price, o.pay_state order_pay_state, o.pay_message, o.pay_type, o.pay_time, o.expire_time,
         o.openid, o.app_id, o.timestamp, o.nonce_str, o.package_val, o.sign_type, o.pay_sign,

--
Gitblit v1.9.3