From 349bcef9a96391d22522a3409adf5a89e7e70a95 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 24 十月 2023 08:46:11 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev --- screen_standard/.env.development | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/screen_standard/.env.development b/screen_standard/.env.development index 5c3ce22..f3ed9b3 100644 --- a/screen_standard/.env.development +++ b/screen_standard/.env.development @@ -6,11 +6,9 @@ #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' -======= -VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api' + # VITE_BASE_URL = 'https://www.mes.red/doumeeplant' ->>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10 + +VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api' +VITE_BASE_URL = 'https://www.mes.red/doumeeplant' -- Gitblit v1.9.3