From 64ff8c4695e1dcfd4442b2656480b3b3a138227d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 23 Dec 2021 09:35:06 +0800
Subject: [PATCH] 冲突

---
 src/router/axios.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/router/axios.js b/src/router/axios.js
index 56b898b..b96680a 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -9,8 +9,8 @@
 
 const service = axios.create({
     //   baseURL: 'http://192.168.0.107:83',
-    baseURL: 'http://192.168.0.107:80',
-    // baseURL: 'http://localhost:82',
+    // baseURL: 'http://192.168.0.107:80',
+    baseURL: 'http://s16s652780.51mypc.cn/api',
     timeout: 600000 // request timeout
 })
 

--
Gitblit v1.9.3