From 90b7083ac2161ea2d06345bd0fa6b22e5af8d862 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期三, 13 九月 2023 17:54:32 +0800
Subject: [PATCH] 大屏

---
 screen_standard/.env.development |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/screen_standard/.env.development b/screen_standard/.env.development
index 5c3ce22..6e3d6c6 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

--
Gitblit v1.9.3