解决冲突

src/services/api.ts

@@ -12,11 +12,8 @@ import * as AfterService from './AfterServiceApi'
 import * as EnhanceApi from './EnhanceApi';
 import * as ReportApi from './ReportApi';
 import * as PurchaseApi from './PurchaseApi';
-<<<<<<< HEAD
 import * as ContractApi from './ContractApi';
-=======
 import * as PurchaseV2Api from './PurchaseV2Api';
->>>>>>> cd175d3d0eeda5e3db8c26acc4fd955479236aa7
 
 /**
  * 可在这里写入自定义的接口
@@ -41,9 +38,6 @@ export const PublicApi = {
   ...EnhanceApi,
   ...ReportApi,
   ...PurchaseApi,
-<<<<<<< HEAD
   ...ContractApi
-=======
   ...PurchaseV2Api,
->>>>>>> cd175d3d0eeda5e3db8c26acc4fd955479236aa7
 }

ytt.config.ts

@@ -12,14 +12,10 @@ const tokenList = [
   { name: 'AfterService', token: '39db719680bf1b3db21bc1deda933cde16d17559e9676bf848ec96c1320e68df', categoryIds: [0], }, // '售后服务'
   { name: 'Enhance', token: '594a7e7ff17f6f40fb9fb726c1da9a3f282a926a8d386eb6cbfd668a3f75f251', categoryIds: [0], }, // 加工服务
   { name: 'Report', token: '69ee5a79363c763ded1a2eb42952a5181ffcdfc5ffb93b6e1e22ac92a25b38bf', categoryIds: [0], }, // 报表服务
-<<<<<<< HEAD
-  { name: 'Purchase', token: '425043481f605f76064951c72d26c412e5ba1baf2d70158300f560ef58358f41', categoryIds: [0], }, // 采购服务
   { name: 'Contract', token: 'b376fc4757c974c0d0c635881b732d97062e3ad41d6f00a003d1e249c91789cf', categoryIds: [0], } // 合同能力
   // { name: 'Purchase', token: 'a09e2b66e00079df9881fc660eb17db0265e33362c13f03f2003ba81d26f49d8', categoryIds: [0], }, // 采购服务
-=======
   { name: 'Purchase', token: 'a09e2b66e00079df9881fc660eb17db0265e33362c13f03f2003ba81d26f49d8', categoryIds: [0], }, // 采购服务
   { name: 'PurchaseV2', token: '84c81ef877863ad4e2c0ebb2c3b3e80f9539420f2fc0828ef33f5159e8423b2c', categoryIds: [0] }, // 采购服务V2
->>>>>>> cd175d3d0eeda5e3db8c26acc4fd955479236aa7
 ]
 
 const getConfigMap = (tokens) => tokens.map(v => ({