样式

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/ProjectPlanningQuery.js
+++ b/src/api/ManufacturingCenter/ProjectPlanningQuery.js
@@ -59,8 +59,6 @@ export function searchtable5(num1, num2, num3, num4, num5, num6, num7, num8, num
    }
  })
 }
-<<<<<<< HEAD
-=======
 // 查询项目总信息
 export function searchAll(num1, num2) {
  return request({
@@ -73,4 +71,3 @@ export function searchAll(num1, num2) {
    }
  })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d