婚姻状况，标本容器,修改密码组织架构

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