From 935b27a40c549f3ebc15e7e9654cdfd01e8eab13 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 04 Jun 2024 11:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into zyqs-0502
---
src/main/resources/mapper/UserOptionLogMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/UserOptionLogMapper.xml b/src/main/resources/mapper/UserOptionLogMapper.xml
index a21ab35..86e54a5 100644
--- a/src/main/resources/mapper/UserOptionLogMapper.xml
+++ b/src/main/resources/mapper/UserOptionLogMapper.xml
@@ -6,7 +6,7 @@
SELECT
t1.*,
t2.accect_type AS userAccectType,
- t3.nick_name AS userName
+ t3.real_name AS userName
FROM
user_option_log t1
LEFT JOIN user_assets t2 ON t1.user_accect_id = t2.id
@@ -15,6 +15,7 @@
<if test="userId!=null and userId!=''">
and t1.user_id = #{userId}
</if>
+ order by create_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3