From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 16 十月 2023 09:03:47 +0800 Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3 --- screen_standard/.env.development | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/screen_standard/.env.development b/screen_standard/.env.development index 5c3ce22..891725e 100644 --- a/screen_standard/.env.development +++ b/screen_standard/.env.development @@ -6,11 +6,10 @@ #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://lingyang.mes.show:1801/doumeeplant' -- Gitblit v1.9.3