样式

2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
--- a/src/api/ManufacturingCenter/ParseQuery.js
+++ b/src/api/ManufacturingCenter/ParseQuery.js
@@ -10,8 +10,6 @@ export function SelectMachine() {
    }
  })
 }
-<<<<<<< HEAD
-=======
 export function ProcessOutsourcing() {
  return request({
    url: '',
@@ -34,4 +32,3 @@ export function ProcessProportion() {
    }
  })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d