From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突
---
static/js/menu.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/static/js/menu.js b/static/js/menu.js
index 6e89662..0542805 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -32,12 +32,12 @@
}, {
v: "璐圭敤缁熻",
i: "font icon-erjidaohang",
- u: "",
+ u: "b1-expenses",
p: ""
}, {
v: "鏍峰搧绠＄悊",
i: "font icon-erjidaohang",
- u: "",
+ u: "b1-sample",
p: ""
}]
},
@@ -543,7 +543,7 @@
}, {
v: "瀹為獙瀹ょ殑妫�娴嬭兘鍔涙。妗�",
i: "font icon-erjidaohang",
- u: "standard_method",
+ u: "a7-standard-method",
g: "7.2 鏂规硶鐨勯�夋嫨銆侀獙璇佸拰纭",
p: "selectStandardMethodList"
}, {
--
Gitblit v1.9.3