From bb0474b0368c0520f0ac12674eb8a5c2ca942170 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 29 一月 2024 09:32:13 +0800
Subject: [PATCH] Mr.Shi

---
 platform/src/api/system/menu.js |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/platform/src/api/system/menu.js b/platform/src/api/system/menu.js
index ad94c4b..3ba843e 100644
--- a/platform/src/api/system/menu.js
+++ b/platform/src/api/system/menu.js
@@ -1,6 +1,5 @@
 import request from '@/utils/request'
 
-<<<<<<< HEAD
 // 鏌ヨ----骞冲彴鑿滃崟
 export function fetchTree () {
   return request.post('/system/menu/treeList/0')
@@ -9,11 +8,6 @@
 // 鏌ヨ----浼佷笟鑿滃崟
 export function fetchTree1 () {
   return request.post('/system/menu/treeList/1')
-=======
-// 鏌ヨ
-export function fetchTree (data, type) {
-  return request.post(`/system/menu/treeList/${type}`, data)
->>>>>>> c6c95a49be6194989c124b8fd316fb5d434bd153
 }
 
 // 鏂板缓
@@ -46,13 +40,8 @@
 }
 
 // 鏌ヨ鑿滃崟鏍�
-<<<<<<< HEAD
 export function fetchMenuTree () {
   return request.get('/system/menu/treeNodes?type=1')
-=======
-export function fetchMenuTree (params) {
-  return request.get('/system/menu/treeNodes', { params })
->>>>>>> c6c95a49be6194989c124b8fd316fb5d434bd153
 }
 
 // 鎺掑簭

--
Gitblit v1.9.3