From ebe4f10feba18e18bd4c744858a779ab75bcf622 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 01 八月 2025 15:44:09 +0800
Subject: [PATCH] qx

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

diff --git a/vue.config.js b/vue.config.js
index 46b9cb2..01c9aaf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,11 +53,6 @@
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [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.113:5011`,
->>>>>>> c12ce4c405d92c0bf11e876468108d1edb134ff2
         // target: `http://192.168.1.244:5011`,
         target: `http://192.168.1.113:5011`,
         // // target: `http://192.168.0.99:8080/ltkj-admin`,

--
Gitblit v1.8.0