From 50e2b67bcd84decac4c6be19271fcab2fd61c28c Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 01 八月 2025 15:53:57 +0800
Subject: [PATCH] 1
---
vue.config.js | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/vue.config.js b/vue.config.js
index c4cd35a..01c9aaf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,10 +53,6 @@
// 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`,
->>>>>>> 6a341a52246c20a662808f055ea446aa06b92a0d
// 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