refactor: 处理合并冲突 --story=130255505

Author: dengyh

frontend/mobile/package.json

@@ -42,11 +42,7 @@
   },
   "dependencies": {
     "amfe-flexible": "^2.2.1",
-<<<<<<< HEAD
     "axios": "^1.6.0",
-=======
-    "axios": "^0.30.0",
->>>>>>> 581b2e0cceac090e615d2f88d0d076a007114a63
     "jquery": "^3.4.1",
     "jsencrypt": "^3.0.0-rc.1",
     "jsonp": "^0.2.1",