更新

2019-05-13 16:00:35 +08:00
parent dfd3fb5d7f fe0ba3d7bd
commit 549eb788b4
28 changed files with 544 additions and 733 deletions
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -640,7 +640,11 @@ export default {

 <style>
  .el-table .warning-row {
+<<<<<<< HEAD
    background: yellowgreen;
+=======
+    background: red;
+>>>>>>> fe0ba3d7bde1d5cfc6a4a87843e945deaff60a8d
  }
  .rgb196{
    background: palevioletred;