处理冲突

src/api/withdrawal.js

@@ -84,14 +84,12 @@ export function getWithdrawalCommissionList(data) {
 }
 
 
-<<<<<<< HEAD
 //  获取提现的账户信息
 export function getWithdrawalAccount(params) {
   return request({
     url: '/idcard/listByShopIds',
     method: 'get',
     params
-=======
 //  导出商家入账列表
 export function exportWithdrawal(data) {
   return request({
@@ -99,6 +97,5 @@ export function exportWithdrawal(data) {
     method: 'post',
     data,
     responseType: 'blob'
->>>>>>> master
   })
 }