合并冲突

licp

2024-04-25 a24f5347bfd2331f8a4819b215f79555776534cd

 src/components/view/role-manage.vue

@@ -127,9 +127,9 @@
                     order: 'asc'
                  }
               },
               isIndex: true,
               showSelect: false,
               select: true,
               isIndex: true,
               do: [{
                  font: '编辑',
                  type: 'text',