From b7167b9db9209a30ee6e2fe4de85b4da703d100c Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 23 四月 2025 11:09:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
vue.config.js | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/vue.config.js b/vue.config.js
index 6d559de..0e775f0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,13 +53,8 @@
// 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.2:5011`,
target: `http://192.168.1.113:5011`,
-=======
- target: `http://192.168.1.113:5011`,
- // target: `http://192.168.1.113:5011`,
->>>>>>> ad78625bb4b876018ac68c6f402c9b21d1a7b3bc
// // 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