From d24b6fe16b7fa9aa608be207f6c9ab158d4e1196 Mon Sep 17 00:00:00 2001 From: Mr.Shi <1878285526@qq.com> Date: 星期二, 12 九月 2023 16:32:22 +0800 Subject: [PATCH] Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev --- screen_standard/.env.development | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/screen_standard/.env.development b/screen_standard/.env.development index faee205..5c3ce22 100644 --- a/screen_standard/.env.development +++ b/screen_standard/.env.development @@ -6,6 +6,11 @@ #VITE_BASE_URL='http://192.168.0.35:10021' # VITE_BASE_PATH='/doumeeplant_api' +<<<<<<< HEAD # VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api/' -VITE_BASE_URL = 'https://www.mes.red/doumeeplant' \ No newline at end of file +VITE_BASE_URL = 'https://www.mes.red/doumeeplant' +======= +VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api' +# VITE_BASE_URL = 'https://www.mes.red/doumeeplant' +>>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10 -- Gitblit v1.9.3