From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/system/RoleUserList.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index d6c78cb..1cdf9ee 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -152,8 +152,8 @@
           </a-table>
         </div>
         <!-- 鍙充晶鐨勮鑹叉潈闄愰厤缃� -->
-        <!-- <user-role-modal ref="modalUserRole"></user-role-modal> -->
-        <user-role-modal-new ref="modalUserRole"></user-role-modal-new>
+        <user-role-modal ref="modalUserRole"></user-role-modal>
+        <!-- <user-role-modal-new ref="modalUserRole"></user-role-modal-new> -->
         <role-modal
           ref="modalForm"
           @ok="modalFormOk"

--
Gitblit v1.9.3