From a24f5347bfd2331f8a4819b215f79555776534cd Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 四月 2024 09:16:57 +0800
Subject: [PATCH] 合并冲突

---
 static/js/menu.js |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/static/js/menu.js b/static/js/menu.js
index afe46e8..23c17b7 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -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