暂存

src/style/style.css

@@ -187,22 +187,15 @@ ul{
 .el-notification.right{
   right:70px !important;
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> 05a9622c4006e6e256bf92bebf8922dea785cf95
 .search__label{
   display: inline-block;
   width: 80px;
   font-size: 14px;
   color:rgb(163, 163, 163) !important;
-<<<<<<< HEAD
-=======
   margin-right: 10px;
-}
 
+}
 .label_center {
   display: flex;
   align-items: center;
->>>>>>> 05a9622c4006e6e256bf92bebf8922dea785cf95
 }