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