From 5bfa6ac57681f0b07649c2f1a54d6afbd3dbc1ba Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:28 +0800
Subject: [PATCH] 提交一把
---
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