From 2ee7a81c2eb0df1fc473da6dbbaa13df662967c5 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 02 七月 2025 15:43:59 +0800
Subject: [PATCH] 1
---
vue.config.js | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/vue.config.js b/vue.config.js
index 0806c46..c838735 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,10 +53,7 @@
// 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.2:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
--
Gitblit v1.8.0