From 64b3ee8aebe765c668b7f04b2bc1ee9a3919bdfb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 24 八月 2023 14:31:01 +0800
Subject: [PATCH] 大屏

---
 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