样式

2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
--- a/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js
+++ b/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js
@@ -1,7 +1,5 @@
 import request from '@/utils/request'

-<<<<<<< HEAD
-=======
 export function insertInto(num2, num3, num4, num5, num6, num7, num8, num9) {
  return request({
    url: '',
@@ -14,7 +12,6 @@ export function insertInto(num2, num3, num4, num5, num6, num7, num8, num9) {
  })
 }

->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询供应商
 export function searchSupplier() {
  return request({