From 1e09b147f84337bcf4d0a106cf246c2ad9d16236 Mon Sep 17 00:00:00 2001
From: lxl <lixuliang_hd@126.com>
Date: 星期二, 20 九月 2022 18:18:56 +0800
Subject: [PATCH] 第六个
---
src/components/navMenu.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index d768658..504277f 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -102,13 +102,12 @@
<el-menu-item index="databaseMonitoring">{{
$t("operatManage.databaseMonitoring")
}}</el-menu-item>
-<<<<<<< HEAD
- <el-menu-item index="blackwhiteList">{{
- $t("operatManage.blackwhiteList")
-=======
+
+ <el-menu-item index="blackwhiteList"
+ >{{ $t("operatManage.blackwhiteList") }}
+ </el-menu-item>
<el-menu-item index="tokentool">{{
$t("operatManage.tokentool")
->>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
}}</el-menu-item>
</el-submenu>
</el-submenu>
--
Gitblit v1.9.3