From 5555caff57d0c67d42cd05e93d7fd4f8a1583377 Mon Sep 17 00:00:00 2001
From: lonewolfyx <877085893@qq.com>
Date: Thu, 5 Feb 2026 13:14:00 +0800
Subject: [PATCH] chore(config): update base URL configuration

---
 config.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config.js b/config.js
index 4c4dc49..1b743ca 100644
--- a/config.js
+++ b/config.js
@@ -2,10 +2,7 @@
 export default {
   // baseUrl: 'https://vue.ruoyi.vip/prod-api',   //
    // baseUrl: '/prod-api',    //前后端分离版的接口地址，转发代理 设置在了manifest.json文件中
-<<<<<<< HEAD
    // baseUrl: 'http://192.168.3.27:18090',    //前后端分离版的接口地址
-=======
->>>>>>> 58da6a52b9b5baa9a2c6179775a634eecca96b80
    baseUrl: 'http://106.15.139.36:18090',    //前后端分离版的接口地址
     //测试提交
   // 应用信息