From 5f6614b4f448890f0b6e82376093ee2878f4464d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 29 Jul 2022 15:21:45 +0800
Subject: [PATCH] 合并冲突

---
 src/api/mobile/ip/index.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/api/mobile/ip/index.js b/src/api/mobile/ip/index.js
index 93f5a6e..72ceb3e 100644
--- a/src/api/mobile/ip/index.js
+++ b/src/api/mobile/ip/index.js
@@ -12,7 +12,7 @@
         // url: 'https://apis.map.qq.com/ws/location/v1/ip',
         // let url = `https://apis.map.qq.com/ws/location/v1/ip?ip=${data.ip}&key=${data.key}`;
         url: `http://192.168.31.179:9898/ws/location/v1/ip?ip=${params.ip}&key=${params.key}`,
-        method: 'get',
+        method: 'get'
         // params: params
     })
 }

--
Gitblit v1.9.3