From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突

---
 src/views/system/role/component/roleDialog.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/system/role/component/roleDialog.vue b/src/views/system/role/component/roleDialog.vue
index 8bdb97a..9bdaac2 100644
--- a/src/views/system/role/component/roleDialog.vue
+++ b/src/views/system/role/component/roleDialog.vue
@@ -33,7 +33,7 @@
 <script lang="ts">
 import { ElMessage } from 'element-plus';
 import { reactive, toRefs, defineComponent } from 'vue';
-import { useRoleApi } from '/@/api/role';
+import { useRoleApi } from '/@/api/systemManage/role';
 
 // 定义接口来定义对象的类型
 interface MenuDataTree {

--
Gitblit v1.9.2