From 32d56327d6f69373ada1c3447f542ec1a39282b1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 06 五月 2024 17:31:01 +0800
Subject: [PATCH] 合并冲突
---
static/js/menu.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/static/js/menu.js b/static/js/menu.js
index afe46e8..59e9dce 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -94,7 +94,7 @@
}, {
v: "鐝",
i: "font icon-erjidaohang",
- u: "",
+ u: "b3-classes",
p: ""
}]
},
@@ -184,6 +184,11 @@
i: "el-icon-s-tools",
u: "system-log",
p: "selectSystemLogList"
+ }, {
+ v: "娑堟伅璇︽儏",
+ i: "el-icon-s-tools",
+ u: "notice-detail",
+ p: "abcd"
}]
},
{
--
Gitblit v1.9.3