From f95fee588c5327b3a4f7b6c283b473c05abb8c76 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 27 六月 2025 17:48:38 +0800
Subject: [PATCH] 1

---
 vue.config.js |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 07ad3fb..9393c29 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -54,14 +54,8 @@
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://ltpeis.xaltjdkj.cn:5801/`,
         // target: `http://192.168.1.99:5012`,
-
-        target: `http://192.168.1.2:5011`,
-
-<<<<<<< HEAD
-        // target: `http://192.168.1.113:5011`,
-=======
-        target: `http://192.168.1.2:5011`,
->>>>>>> f1bd6c371da44538248ea8fd479f0f4a2180e337
+        target: `http://192.168.1.113:5011`,
+        // 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