From 3a4041f3eef38f38fa03d6305bea9faead06c133 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 10 五月 2024 16:36:43 +0800
Subject: [PATCH] 合并冲突
---
static/js/menu.js | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/static/js/menu.js b/static/js/menu.js
index 831a1ca..4f54acf 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -13,7 +13,7 @@
{
v: "涓氬姟绠＄悊",
i: "font icon-kexueyanjiuheshiyankaifa",
- p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport",
+ p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport pageInsUnPass",
c: [{
v: "妫�楠屼笅鍗�",
i: "font icon-erjidaohang",
@@ -39,12 +39,13 @@
i: "font icon-erjidaohang",
u: "b1-sample",
p: "selectWarehouse"
- }, {
+ },{
v: "涓嶅悎鏍肩鐞�",
i: "font icon-erjidaohang",
- u: "",
+ u: "b1-unpass",
p: ""
- }]
+ }
+ ]
},
{
v: "鏍囧噯闆�",
--
Gitblit v1.9.3