From 590794315aa2dff6b91354c83c9e7a1e7c908ff0 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 30 六月 2023 19:59:42 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS-WEB/vue.config.js | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 59e2f02..ffd790a 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -25,24 +25,15 @@
port: 38000,
proxy: {
'/api': {
-<<<<<<< HEAD
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
target: 'http://localhost:37000',
-=======
- // target: 'http://localhost:37000',
- // target: 'http://localhost:37000',
->>>>>>> ec1d5f8469e9fbc9acea80b2c4a8ea8a1eb4f6f8
// target: 'http://192.168.1.51:37000',
- target: 'http://192.168.1.46:37000',
+ // target: 'http://192.168.1.46:37000',
// target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
-<<<<<<< HEAD
- // target: 'http://192.168.3.7:37000',
-=======
//target: 'http://192.168.3.7:37000',
->>>>>>> ec1d5f8469e9fbc9acea80b2c4a8ea8a1eb4f6f8
// target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target:'http://192.168.1.104:37000',
--
Gitblit v1.9.3