样式

2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
--- a/src/api/PurchasingCenter/PurchaseContractSearch.js
+++ b/src/api/PurchasingCenter/PurchaseContractSearch.js
@@ -59,8 +59,6 @@ export function deleteContract(num) {
    }
  })
 }
-<<<<<<< HEAD
-=======
 // 删除采购合同
 export function handleDone(num) {
  return request({
@@ -72,4 +70,3 @@ export function handleDone(num) {
    }
  })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d