From 319cf42af7648e99693f6eabfec4f842a40ed340 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期四, 13 三月 2025 16:16:27 +0800
Subject: [PATCH] 1

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

diff --git a/vue.config.js b/vue.config.js
index 6d559de..eb6d728 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,13 +53,14 @@
       // 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.2:5011`,
         // target: `http://192.168.1.113:5011`,
->>>>>>> ad78625bb4b876018ac68c6f402c9b21d1a7b3bc
         // // 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