From 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 04 三月 2023 12:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
index 80434cf..b2332a6 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
@@ -60,12 +60,13 @@
m.description,
m.create_time as createTime,
m.hidden,
- m.icon
+ m.icon,
+ m.sort
FROM ums_admin_role_relation arr
INNER JOIN `ums_role_menu_relation` AS rmr on rmr.role_id = arr.role_id
JOIN ums_menu AS m ON rmr.menu_id = m.id
WHERE arr.admin_id = #{id}
- order by m.id
+ order by m.sort
</select>
</mapper>
--
Gitblit v1.8.0