处理冲突

common/http.js

@@ -1,10 +1,9 @@
-<<<<<<< .mine
+
 // const ip = 'http://192.168.88.12:8080'; //线下
 const ip = 'http://hs-server.aseanbusiness.cn'; //线上
-=======
-const ip = 'http://192.168.88.36:8080'; //线下
-//const ip = 'http://114.118.9.159:8080/prod-api'; //线上
->>>>>>> .theirs
+
+//const ip = 'http://192.168.88.36:8080'; //线下
+
 /**
  * 封装的http请求
  */