From d619db3d897b4d6991ff14940c47b8cb08c91edb Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Fri, 5 Jan 2024 11:19:39 +0800 Subject: [PATCH] 1 --- .env.dev | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.env.dev b/.env.dev index a7cac807..4fa61a97 100644 --- a/.env.dev +++ b/.env.dev @@ -13,16 +13,11 @@ VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://100.64.0.26:48082' -<<<<<<< HEAD VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://10.70.2.2:8080' -======= -# VUE_APP_BASE_API = 'http://10.70.2.2:8080' -# VUE_APP_BASE_API = 'http://192.168.0.33:48082' ->>>>>>> projects/mesxc-test # VUE_APP_BASE_API = 'http://192.168.4.173:48080' # VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48082' -- 2.24.3