From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期三, 26 二月 2025 15:07:23 +0800 Subject: [PATCH] 合并冲突 --- static/js/menu.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/static/js/menu.js b/static/js/menu.js index 2b482be..503a3ea 100644 --- a/static/js/menu.js +++ b/static/js/menu.js @@ -335,8 +335,8 @@ { v: "璁惧", i: "font icon-erjidaohang", - // u: "a6-device", - u:"a6-device-management", + u: "a6-device", + // u:"a6-device-management", g: "璁惧", p: "" }, -- Gitblit v1.9.3