From bd8fad2657bb1874576556d87de2d77f7d2fa851 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Wed, 2 Aug 2023 17:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E5=A7=BB=E7=8A=B6=E5=86=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=87=E6=9C=AC=E5=AE=B9=E5=99=A8,=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 338bc45..d1e2566 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -12,18 +12,6 @@
                   @click.native="$router.push({ path: '/organization-units' })"
                   >组织架构</el-dropdown-item
                 >
-<<<<<<< HEAD
-=======
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/role' })"
-                  >角色管理</el-dropdown-item
-                >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/user-list' })"
-                  >用户管理</el-dropdown-item
-                >
-
->>>>>>> 99be594 (婚姻状况，标本容器,修改密码组织架构)
                 <el-dropdown-item
                   @click.native="$router.push({ path: '/role' })"
                   >角色管理</el-dropdown-item