From 29d2aabc6a07be091d7b52ba51e12a6baf16f7ac Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 06 六月 2023 17:40:18 +0800
Subject: [PATCH] 接口配置冲突

---
 Source/UBCS-WEB/vue.config.js |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index c3b6e82..5259a48 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -29,8 +29,13 @@
         //  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://192.168.1.51:37000/',
+>>>>>>> a3c7b3f7a4778a777a78a72c968b0e172488df03
         //杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
         // target: 'https://saber.bladex.vip/api',
         ws: true,

--
Gitblit v1.9.3