update

src/api/hisStore/storeOrder.js

@@ -332,7 +332,6 @@ export function orderDimensionStatisticsExport(query) {
 export function importDeliveryNoteExpressTemplate() {
   return request({
     url: '/store/store/storeOrder/importDeliveryNoteExpressTemplate',
-<<<<<<< HEAD
     method: 'get'
   })
 }
@@ -381,8 +380,6 @@ export function batchSetErpOrder(data) {
 export function getErpAccount() {
   return request({
     url: '/store/store/storeOrder/getErpAccount',
-=======
->>>>>>> 04e9aa17dd9058d3feb4ed058f321df845dd083c
     method: 'get'
   })
 }