Merge branch 'xin' into pxb

彭雪彬

2025-07-15 d001341d0e0b4fa9bc09dbd0ef3abe8947f81717

Merge branch 'xin' into pxb

 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,

 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,