From 44e88cb3c7d2f46eb9dbbbdddf0aa3f8a623b6e2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 13 六月 2023 18:59:51 +0800
Subject: [PATCH] 继续完善主题库定义

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

diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index fda7e7d..e0affab 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,19 +26,17 @@
     proxy: {
       '/api': {
         //鏈湴鏈嶅姟鎺ュ彛鍦板潃
-<<<<<<< HEAD
         //  target: 'http://localhost:37000',
-        // target: 'http://192.168.1.63:37000',
-        //target: 'http://192.168.3.7: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/',
-=======
-          target: 'http://localhost:37000',
+        //   target: 'http://localhost:37000',
         // target: 'http://192.168.1.63:37000',
         //target: 'http://192.168.3.7:37000',
-        //target: 'http://dev.vci-tech.com:37000',
+        // target: 'http://dev.vci-tech.com:37000',
         //target: 'http://192.168.1.51:37000/',
->>>>>>> 9474fadca23df051af1789b2078aca9c3163a017
         //杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
         // target: 'https://saber.bladex.vip/api',
         ws: true,

--
Gitblit v1.9.3