From 24fab86e819834e06406900a05cf25958faad0ce Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 29 五月 2023 18:42:37 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/vue.config.js | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 3b94341..81c05fb 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,17 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
+<<<<<<< HEAD
// target: 'http://localhost:37000',
//target: 'http://192.168.3.7:37000',
+ target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://192.168.1.51:37000/',
+=======
+ target: 'http://localhost:37000',
+ // target: 'http://192.168.3.7:37000',
// target: 'http://dev.vci-tech.com:37000',
- target: 'http://192.168.1.51:37000/',
+ //target: 'http://192.168.1.51:37000/',
+>>>>>>> 1a5351f560e5833cc10127f8188c627b54146478
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3