From 66afa3c24982b479a7c13bd8a0fb335435e8ecff Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 27 七月 2023 10:25:37 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

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

diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index ad43a75..8ee6cb6 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -29,7 +29,11 @@
         target: 'http://localhost:37000',
         // target: 'http://192.168.1.51:37000',
         // target: 'http://192.168.1.46:37000',
+<<<<<<< HEAD
+        target: 'http://dev.vci-tech.com:37000',
+=======
         // target: 'http://dev.vci-tech.com:37000',
+>>>>>>> ddc9d8eabf96d9fa59b37b1734050d72cf7afff8
         // 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