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/OrderMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
index 184665f..427731f 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
@@ -6,6 +6,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="order_describe" property="orderDescribe"/>
<result column="original_price" property="originalPrice"/>
<result column="paid_price" property="paidPrice"/>
@@ -29,7 +31,7 @@
</resultMap>
<sql id="Base_Column_List">
- order_id, order_num, user_id, store_id, order_describe, original_price, paid_price, actually_pay_price, pay_state, pay_message, pay_type, pay_time, expire_time, openid, app_id, timestamp, nonce_str, package_val, sign_type, pay_sign, create_by, create_time, update_by, update_time
+ order_id, order_num, user_id, store_id, store_name, store_logo, order_describe, original_price, paid_price, actually_pay_price, pay_state, pay_message, pay_type, pay_time, expire_time, openid, app_id, timestamp, nonce_str, package_val, sign_type, pay_sign, create_by, create_time, update_by, update_time
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -64,4 +66,4 @@
</where>
order by order_id desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3