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 |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/screen_standard/.env.development b/screen_standard/.env.development
index faee205..ea312df 100644
--- a/screen_standard/.env.development
+++ b/screen_standard/.env.development
@@ -6,6 +6,19 @@
 #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'
+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