002390 1 year ago
parent
commit
eb907cef90
1 changed files with 0 additions and 4 deletions
  1. 0 4
      src/api/business/purchase/purchase-order.js

+ 0 - 4
src/api/business/purchase/purchase-order.js

@@ -211,9 +211,5 @@ export default {
   orderExport,
   orderImport,
   downloadFailData,
-<<<<<<< HEAD
-  getInfo,
-=======
   oaBack
->>>>>>> 63b9d5430993341d0334b43d77a2fad811c0186b
 }