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