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>
