From dff404a76987de5b632ae635a6dea6c95dc37a4d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 四月 2024 16:58:59 +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 4de375e..d34f6ff 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -279,13 +279,13 @@
}, {
v: "浜哄憳鎬昏",
i: "font icon-erjidaohang",
- u: "",
+ u: "a6-personnel-overview",
g: "6.2 浜哄憳",
p: ""
}, {
v: "浜哄憳鏄庣粏",
i: "font icon-erjidaohang",
- u: "",
+ u: "a6-personnel-detail",
g: "6.2 浜哄憳",
p: ""
}, {
--
Gitblit v1.9.3