From 2a431ace3a7b7dcdd313bb2fa0eff5bb727946f8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 14:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 screen_standard/.env.development |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/screen_standard/.env.development b/screen_standard/.env.development
index 0ee6f4b..5c3ce22 100644
--- a/screen_standard/.env.development
+++ b/screen_standard/.env.development
@@ -1,10 +1,16 @@
 NODE_ENV = development
 VITE_NAME='寮�鍙戠幆澧�'
 
-VITE_BASE_CONTEXT=''
+VITE_BASE_CONTEXT='screen'
 VITE_BASE_PATH='/api'
-VITE_BASE_URL='http://192.168.0.35:10021'
+#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

--
Gitblit v1.9.3