From 47912d45e15872e9bf7ebd2286d1442e405e8471 Mon Sep 17 00:00:00 2001
From: Connor <1813766834@qq.com>
Date: Wed, 12 Jun 2024 22:24:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/config.js b/config.js
index 299e5a3..109b800 100644
--- a/config.js
+++ b/config.js
@@ -2,15 +2,11 @@
 export default {
   qnDomain: 'http://seueton5q.hn-bkt.clouddn.com/',
   uploadQiNiuDomain: 'https://upload-z2.qiniup.com',
- // baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  // baseUrl: 'http://47.93.242.168:8080',
-<<<<<<< HEAD
-     // baseUrl: 'http://47.93.242.168:8080',
+// baseUrl: 'https://vue.ruoyi.vip/prod-api',
+// baseUrl: 'http://47.93.242.168:8080',
+// baseUrl: 'http://47.93.242.168:8080',
  baseUrl: 'http://localhost:8080',
-=======
-   //  baseUrl: 'http://47.93.242.168:8080',
-  baseUrl: 'http://localhost:8080',
->>>>>>> 628ee1926942d01758e141fb0b5393a175968240
+
   // 应用信息
   appInfo: {
     // 应用名称