From b2be889ee9931b8ca97d77258466d75043b22786 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期一, 18 八月 2025 21:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityInviteMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityInviteMapper.xml b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityInviteMapper.xml
index b5ebff3..beb628d 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityInviteMapper.xml
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityInviteMapper.xml
@@ -33,7 +33,8 @@
c.couponUseType as couponUseType,
c.couponType as couponType,
a.totalPrice as totalPrice,
- a.lavePrice as lavePrice
+ a.lavePrice as lavePrice,
+ c.name as name
from t_user_activity_invite a
left join t_user_activity b on (a.userActivityId = b.id)
left join t_sys_coupon_record c on (a.couponId = c.id)
--
Gitblit v1.7.1