样式

src/api/PurchasingCenter/CreateInquirySheet.js

@@ -1,7 +1,5 @@
 import request from '@/utils/request'
 
-<<<<<<< HEAD
-=======
 // 查询询价单号
 export function getBillNum(num) {
   return request({
@@ -23,7 +21,6 @@ export function getGongyings(num) {
     }
   })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询全部未询价的标准件和外购件
 export function getExport1(num) {
   return request({
@@ -154,11 +151,7 @@ export function searchSheetDetail(num2) {
   })
 }
 // 创建询价单
-<<<<<<< HEAD
-export function createInquirySheet(num1, num2, remark, id) {
-=======
 export function createInquirySheet(num1, id, num2, remark) {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   return request({
     url: '',
     method: 'post',