From 0b89c49a1e3ab87368b689d985e28a977a9bb84e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 13:08:20 +0800
Subject: [PATCH] 合并冲突

---
 src/components/view/role-manage.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/view/role-manage.vue b/src/components/view/role-manage.vue
index 7fdf0e2..9bc9e85 100644
--- a/src/components/view/role-manage.vue
+++ b/src/components/view/role-manage.vue
@@ -127,9 +127,9 @@
 							order: 'asc'
 						}
 					},
-					isIndex: true,
 					showSelect: false,
 					select: true,
+					isIndex: true,
 					do: [{
 						font: '缂栬緫',
 						type: 'text',

--
Gitblit v1.9.3