合并错误

src/css/itemManager.less

@@ -133,7 +133,6 @@
         width:60px;
         height:32px;
         background:@activeColor;
-        background:#5A8EEE;
         border-radius:4px;
         color: #fff;
         text-align: center;

src/css/qcList.less

@@ -112,12 +112,12 @@ table{
     margin: 0 20px 5px 0;
     span{
         display: inline-block;
-        line-height: 36px;
+        line-height: 32px;
         position: relative;
     }
     input{
         width:120px;
-        height:36px;
+        height:32px;
         border-radius:4px;
         border: 1px solid #E2E5EF;
         outline: none;
@@ -165,7 +165,7 @@ table{
     position: relative;
     width:120px;
     padding: 0 10px;
-    height:36px;
+    height:32px;
     border-radius:4px;
     border: 1px solid #E2E5EF;
     box-sizing: border-box;
@@ -178,12 +178,12 @@ table{
 .filter,.reset{
     display: inline-block;
     width:60px;
-    height:36px;
+    height:32px;
     background:@activeColor;
     border-radius:4px;
     color: #fff;
     text-align: center;
-    line-height: 36px;
+    line-height: 32px;
     position: relative;
     top: 2px;
     cursor: pointer;

src/css/qcListDept.less

@@ -181,7 +181,6 @@ table{
     width:60px;
     height:32px;
     background:@activeColor;
-    background:#5A8EEE;
     border-radius:4px;
     color: #fff;
     text-align: center;

src/css/qcListPerson.less

@@ -193,7 +193,6 @@ table{
     width:60px;
     height:32px;
     background:@activeColor;
-    background:#5A8EEE;
     border-radius:4px;
     color: #fff;
     text-align: center;

src/css/reset.less

@@ -413,11 +413,11 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
   }
 }
 .filterclearT {
-  height: 34px !important;
-  line-height: 36px !important;
+  height: 30px !important;
+  line-height: 32px !important;
   float: left;
   position: relative;
-  top: 3px !important;
+  top: 2px !important;
 }
 .goHomeDetail {
   color: #00A1F0;