From 6078b6102d5cfc4603e573f78b8dc30e9d5c2e0e Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 18 七月 2023 16:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/vue.config.js | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 5259a48..0991057 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,16 +26,16 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- // target: 'http://localhost:37000',
- // target: 'http://192.168.1.63:37000',
- //target: 'http://192.168.3.7:37000',
-<<<<<<< HEAD
- // target: 'http://dev.vci-tech.com:37000',
- target: 'http://192.168.1.51: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/',
->>>>>>> a3c7b3f7a4778a777a78a72c968b0e172488df03
+ // target: 'http://192.168.1.104:37000',
+ // target: 'http://192.168.1.63:37000',
+ // target: 'http://192.168.3.7:37000',
+ // target: 'http://192.168.1.51:37000/',
+ // target: 'http://192.168.1.104:37000',
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3