From fd6d3fdb69e558ee867a97818124857564f4a849 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 03 七月 2025 17:38:32 +0800
Subject: [PATCH] qx

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

diff --git a/vue.config.js b/vue.config.js
index 2e65879..c838735 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -54,11 +54,7 @@
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://ltpeis.xaltjdkj.cn:5801/`,
         // target: `http://192.168.1.99:5012`,
-<<<<<<< HEAD
-        target: `http://192.168.1.2:5011`,
-=======
         target: `http://192.168.1.113:5011`,
->>>>>>> 2ee7a81c2eb0df1fc473da6dbbaa13df662967c5
         // target: `http://192.168.1.2:5011`,
         // // target: `http://192.168.0.99:8080/ltkj-admin`,
         // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,

--
Gitblit v1.8.0