From 0b89c49a1e3ab87368b689d985e28a977a9bb84e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 13:08:20 +0800
Subject: [PATCH] 合并冲突
---
static/js/menu.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/static/js/menu.js b/static/js/menu.js
index 9eed660..ceca16d 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -18,16 +18,16 @@
v: "妫�楠屼笅鍗�",
i: "font icon-erjidaohang",
u: "b1-inspection-order",
- p: ""
+ p: "selectInsOrderParameter"
}, {
v: "妫�楠屼换鍔�",
i: "font icon-erjidaohang",
- u: "",
- p: ""
+ u: "b1-inspect-order-plan",
+ p: "selectInsOrderPlanList"
}, {
v: "鎶ュ憡缂栧埗",
i: "font icon-erjidaohang",
- u: "",
+ u: "b1-report-preparation",
p: ""
}, {
v: "璐圭敤缁熻",
@@ -37,7 +37,7 @@
}, {
v: "鏍峰搧绠＄悊",
i: "font icon-erjidaohang",
- u: "",
+ u: "b1-sample",
p: ""
}]
},
@@ -64,7 +64,7 @@
c: [{
v: "宸ユ椂绠＄悊",
i: "font icon-erjidaohang",
- u: "fans-submit",
+ u: "",
p: ""
}, {
v: "浜哄憳鑰冨嫟",
@@ -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