From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 07 十一月 2023 15:47:13 +0800 Subject: [PATCH] bug --- screen_standard/.env.development | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/screen_standard/.env.development b/screen_standard/.env.development index 891725e..ea312df 100644 --- a/screen_standard/.env.development +++ b/screen_standard/.env.development @@ -6,6 +6,7 @@ #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' @@ -13,3 +14,11 @@ VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api' # VITE_BASE_URL = 'https://www.mes.red/doumeeplant' VITE_BASE_URL = 'https://lingyang.mes.show:1801/doumeeplant' +======= + + +# 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' +>>>>>>> dev -- Gitblit v1.9.3