菜单样式调整

src/layout/sidebar/Sidebar.vue

@@ -1,10 +1,6 @@
 <template>
   <div>
-<<<<<<< HEAD
     <el-menu style="border: 0;" background-color="#266999" text-color="rgba(255, 255, 255, 1)" active-text-color="#ffd04b" :collapse="isCollapse"
-=======
-    <el-menu style="border: 0;" background-color="#104986" text-color="rgba(255, 255, 255, 1)" active-text-color="#ffd04b" :collapse="isCollapse"
->>>>>>> 87c125fc7f035d7128e81117b725389fba30d67c
       :collapse-transition="false" router mode="vertical" :unique-opened="true">
       <sidebarItem></sidebarItem>
     </el-menu>