From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 19 五月 2025 09:45:07 +0800 Subject: [PATCH] git ch --- 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