From dc28e1f365d0fe26017db3e389e4462962c0b380 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 28 七月 2023 13:20:03 +0800
Subject: [PATCH] 主数据导入导出

---
 Source/UBCS-WEB/vue.config.js |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

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

--
Gitblit v1.9.3