From 3a4041f3eef38f38fa03d6305bea9faead06c133 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 10 五月 2024 16:36:43 +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 8c941a9..4f54acf 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -70,7 +70,7 @@
c: [{
v: "宸ユ椂绠＄悊",
i: "font icon-erjidaohang",
- u: "",
+ u: "b3-work-time-management",
p: ""
}, {
v: "浜哄憳鑰冨嫟",
@@ -100,7 +100,7 @@
}, {
v: "鐝",
i: "font icon-erjidaohang",
- u: "",
+ u: "b3-classes",
p: ""
}]
},
--
Gitblit v1.9.3