From e37f01fa701f66450f5a40f1414f3ea8cffc30ee Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期四, 03 四月 2025 08:47:29 +0800
Subject: [PATCH] 4.3

---
 vue.config.js |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 6d559de..4ef52b5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,13 +53,8 @@
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://ltpeis.xaltjdkj.cn:5801/`,
-<<<<<<< HEAD
         // target: `http://192.168.1.2:5011`,
-        target: `http://192.168.1.113:5011`,
-=======
-        target: `http://192.168.1.113:5011`,
-        // target: `http://192.168.1.113:5011`,
->>>>>>> ad78625bb4b876018ac68c6f402c9b21d1a7b3bc
+        target: `http://192.168.1.2:5011`,
         // // target: `http://192.168.0.99:8080/ltkj-admin`,
         // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
         // target: `http://10.168.0.9:5011`,

--
Gitblit v1.8.0