feat:解决合并代码后的冲突

src/core/antd.less

@@ -656,9 +656,8 @@ td.ant-table-column-sort {
     background-color: #2966ff !important;
     background-color: #2966ff !important;
     opacity: 0.8 !important;
     opacity: 0.8 !important;
   }
   }
-  &:focus,
-  &:active {
-    background-color: #5c8aff !important;
+  &:active{
+    background-color:#5C8AFF !important;
   }
   }
 }
 }
 
 

src/modules/college-manage/EmployeeManage.less

+.employee-manage-page{
+    .box-header{
+        margin-bottom:4px;
+    }
+    .add-show-btn{
+        margin-top:12px;
+    }
+}
\ No newline at end of file

src/modules/college-manage/EmployeeManage.tsx

@@ -263,7 +263,7 @@ function EmployeeManage() {
   }
   }
 
 
   return (
   return (
-    <div className=" page employee-manage-page">
+    <div className="page employee-manage-page">
         <div className="content-header">员工管理</div>
         <div className="content-header">员工管理</div>
         <div className="box">
         <div className="box">
           <div className="box-header">
           <div className="box-header">

src/modules/root/Header.less

@@ -186,7 +186,7 @@
       flex: 1;
       flex: 1;
       -webkit-flex: 1;
       -webkit-flex: 1;
       justify-content: space-between;
       justify-content: space-between;
-      margin-left: 54px;
+      margin-left: 62px;
       .college-container {
       .college-container {
         position: relative;
         position: relative;
         width: 360px;
         width: 360px;

src/modules/root/Menu.less

@@ -13,10 +13,11 @@
   background: @menu-bakg;
   background: @menu-bakg;
   color: #333;
   color: #333;
   .menu-type-icon{
   .menu-type-icon{
-    margin:4px  0 4px 156px;
+    margin:4px  0 4px 150px;
     cursor: pointer;
     cursor: pointer;
     .icon{
     .icon{
       font-size:14px;
       font-size:14px;
+      color:#5E606A;
     }
     }
   }
   }
   .ant-menu {
   .ant-menu {
@@ -74,6 +75,7 @@
       .ant-menu-item-selected{
       .ant-menu-item-selected{
         background-color:@active-color;
         background-color:@active-color;
         color:#FFF;
         color:#FFF;
+        border-radius:2px;
         &:hover{
         &:hover{
           color:#FFF;
           color:#FFF;
         }
         }
@@ -99,10 +101,14 @@
         }
         }
       
       
       }
       }
-     
+      .ant-menu-submenu-arrow{
+        right:22px;
+        color:#5E606A;
       }
       }
     }
     }
   
   
+  }
+
   &.left-container-vertical {
   &.left-container-vertical {
     width: 62px;
     width: 62px;
     .menu-type-icon{
     .menu-type-icon{
@@ -126,15 +132,15 @@
 .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
 .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
   background:@active-color !important;
   background:@active-color !important;
 }
 }
-
 .ant-menu.ant-menu-dark, .ant-menu-dark .ant-menu-sub, .ant-menu.ant-menu-dark .ant-menu-sub{
 .ant-menu.ant-menu-dark, .ant-menu-dark .ant-menu-sub, .ant-menu.ant-menu-dark .ant-menu-sub{
   background: @menu-bakg !important;
   background: @menu-bakg !important;
 }
 }
-
+.ant-menu-submenu-popup{
+  left:67px !important;
+}
 .ant-menu-submenu-popup>.ant-menu {
 .ant-menu-submenu-popup>.ant-menu {
   background: @menu-bakg  !important;
   background: @menu-bakg  !important;
   color: #333;
   color: #333;
-  padding-left: 15px;
   width: 132px;
   width: 132px;
   min-width: auto;
   min-width: auto;
   li {
   li {