From f049f0aa547252a76e9523dbf3a236803e7e4f1b Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 20 六月 2023 10:54:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/vue.config.js | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index fda7e7d..1a031f6 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,19 +26,17 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
-<<<<<<< HEAD
- // target: 'http://localhost:37000',
- // target: 'http://192.168.1.63:37000',
- //target: 'http://192.168.3.7:37000',
- target: 'http://dev.vci-tech.com:37000',
+ target: 'http://localhost:37000',
+ // target: 'http://192.168.1.51:37000',
+ // target: 'http://192.168.1.46:37000',
+ // target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
-=======
- target: 'http://localhost:37000',
+ // target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
//target: 'http://192.168.3.7:37000',
- //target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://dev.vci-tech.com:37000',
//target: 'http://192.168.1.51:37000/',
->>>>>>> 9474fadca23df051af1789b2078aca9c3163a017
+ // target:'http://192.168.1.104:37000',
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3