From 67d2338b3dd43c5972159822aa3dd8f53cd3c78b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 四月 2024 11:14:00 +0800
Subject: [PATCH] 合并冲突
---
static/js/menu.js | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/static/js/menu.js b/static/js/menu.js
index 6e89662..740eaf2 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -13,7 +13,7 @@
{
v: "涓氬姟绠＄悊",
i: "font icon-kexueyanjiuheshiyankaifa",
- p: "",
+ p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport",
c: [{
v: "妫�楠屼笅鍗�",
i: "font icon-erjidaohang",
@@ -28,16 +28,16 @@
v: "鎶ュ憡缂栧埗",
i: "font icon-erjidaohang",
u: "b1-report-preparation",
- p: ""
+ p: "pageInsReport"
}, {
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