From 8fff5843dcf04799ff6853c330f319a67cc2142f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 18 七月 2023 12:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/vue.config.js | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index b93b10b..0991057 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -28,13 +28,8 @@
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
// target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
-<<<<<<< HEAD
// target: 'http://192.168.1.46:37000',
target: 'http://dev.vci-tech.com:37000',
-=======
- target: 'http://192.168.1.46:37000',
- // target: 'http://dev.vci-tech.com:37000',
->>>>>>> edf6f5f6aedf7797861b088ad1058f75d2074ce1
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
--
Gitblit v1.9.3