From 192a9ca53f6e9292def6a67a026a5fb63179f8c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E9=A6=99=E7=90=AA?= <624506849@qq.com>
Date: Wed, 15 Jul 2026 17:07:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(manager):=20=E8=A7=A3=E5=86=B3=20util.js=20?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81=E6=A0=87=E8=AE=B0=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/libs/util.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/manager/src/libs/util.js b/manager/src/libs/util.js
index 47c572e1..2b46a803 100644
--- a/manager/src/libs/util.js
+++ b/manager/src/libs/util.js
@@ -1,18 +1,13 @@
-import lazyLoading from "./lazyLoading.js";
+import lazyLoading from "./lazyLoading.js";
 import { getRouter } from "./router-holder";
 import Cookies from "js-cookie";
 
 let util = {};
 
-<<<<<<< HEAD
-/** 已弃用、前端未实现的菜单 frontRoute，注册路由时跳过 */
-const DEPRECATED_FRONT_ROUTES = new Set([
-  "distribution/distrbutionGrade",
-=======
-/** 已弃用、前端已移除的菜单 frontRoute，注册路由时跳过 */
+/** 已弃用、前端未实现或已移除的菜单 frontRoute，注册路由时跳过 */
 const DEPRECATED_FRONT_ROUTES = new Set([
   "goods/goods-manage/spec",
->>>>>>> vue3
+  "distribution/distrbutionGrade",
 ]);
 
 function isDeprecatedMenu(menu) {