From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml
index 3abadcd..06d64a1 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml
@@ -4,9 +4,10 @@
<select id="getList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- select *
- from t_red_set
- where t_red_set.isDelete = 0
- order by updateTime desc
+ select t_red_envelope_payment_settings.*,sys_user.name as handle
+ from t_red_envelope_payment_settings
+ left join sys_user on t_red_envelope_payment_settings.insertUserId = sys_user.id
+ where t_red_envelope_payment_settings.status = 1
+ order by insertTime desc
</select>
</mapper>
--
Gitblit v1.7.1