From e4be5ba9eea9fe8408f3a7048a315b3767b33f49 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 23 二月 2024 09:54:38 +0800
Subject: [PATCH] mrshi
---
platform/src/components/system/role/MenuConfigWindow.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/platform/src/components/system/role/MenuConfigWindow.vue b/platform/src/components/system/role/MenuConfigWindow.vue
index aa9ae58..536f92e 100644
--- a/platform/src/components/system/role/MenuConfigWindow.vue
+++ b/platform/src/components/system/role/MenuConfigWindow.vue
@@ -50,12 +50,8 @@
* @role 瑙掕壊瀵硅薄
*/
open (role) {
-<<<<<<< HEAD
if (this.userInfo.type === 1) {
fetchTree1({})
-=======
- fetchMenuList({})
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
.then(records => {
this.role = role
this.menus = records
--
Gitblit v1.9.3