Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/NameCircle.vue

src/components/NameCircle.vue

@@ -79,6 +79,10 @@ const initUser = (user) => {
     user["icon"] = 'MoreFilled'
     user["color"] = "#c0c4cc"
   }
+  if (state === 'ROLLBACK') {
+    user["icon"] = 'RefreshLeft'
+    user["color"] = "#f78f5f"
+  }
   return user;
 }
 
@@ -111,19 +115,5 @@ init()
   }
 
 
-}
-@media print {
-  /* 打印时应用的样式 */
-  .el-checkbox.is-checked .el-checkbox__inner .svg-icon {
-    background-color: #f5f7fa !important;
-    border-color: #409eff !important;
-  }
-  .el-checkbox__inner::after {
-    /* 设置选中的checkbox符号颜色 */
-    color: #409eff !important;
-  }
-  //.el-icon {
-  //  color: rgba(0, 0, 0, 1) !important;
-  //}
 }
 </style>