From 11079cf5c81a047c3a343581a5cc6001fb4a2ec8 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期日, 28 九月 2025 14:09:59 +0800
Subject: [PATCH] Merge branch 'dev' into send_coupon

---
 framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
index 185947a..238bbc7 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
@@ -63,7 +63,8 @@
             "o.logistics_time AS logistics_time," +
             "o.complete_time AS complete_time," +
             "o.store_name AS store_name, " +
-            "m.nick_name AS nickName" +
+            "m.nick_name AS nickName," +
+            "o.member_id AS memberId" +
             " FROM li_order o LEFT JOIN li_order_item oi ON oi.order_sn = o.sn " +
             "LEFT JOIN li_member m on m.id = o.member_id " +
             "${ew.customSqlSegment}")

--
Gitblit v1.8.0