更新

src/styles/index.scss

@@ -526,19 +526,9 @@ code {
 }
 
 // 修改选中表格内容颜色
-<<<<<<< .mine
-.el-table .success-row  {
-  background: #87ceff !important;
-=======
 .el-table .success-row {
   background: #87ceff !important;
->>>>>>> .theirs
 }
-<<<<<<< .mine
-.el-checkbox__inner  {
-  border: 1px solid #696969 !important;
-=======
 .el-checkbox__inner {
   border: 1px solid #696969 !important;
->>>>>>> .theirs
 }