From 0aa0bbdfde221a46019f90a245e40d6b57fd251b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 11 七月 2023 19:09:03 +0800
Subject: [PATCH] 编码规则bug修复

---
 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..ad43a75 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://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://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