From b767cea8ee6bf2e782c7727ad9ccfd1d69b4f8cb Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 08 七月 2025 13:55:58 +0800
Subject: [PATCH] qx

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

diff --git a/vue.config.js b/vue.config.js
index 0806c46..809f8b0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,12 +53,9 @@
       // 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.99:5012`,
->>>>>>> f95fee588c5327b3a4f7b6c283b473c05abb8c76
+        // 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.0.99:8080/ltkj-admin`,
         // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
         // target: `http://10.168.0.9:5011`,

--
Gitblit v1.8.0