From ca73a173f008c8d7a9d700bad897ca24fe2d2203 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 16 十月 2023 09:29:57 +0800
Subject: [PATCH] 111

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