From a69578ed877252e70d45d4753258b3d7b6937606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:24:34 +0800
Subject: [PATCH] a

---
 h5_standard/.env.production |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/h5_standard/.env.production b/h5_standard/.env.production
index 9d57589..f783c6a 100644
--- a/h5_standard/.env.production
+++ b/h5_standard/.env.production
@@ -18,9 +18,13 @@
 # VUE_APP_API = 'https://hsky.doumee.com/doumeeplant_api/'
 
 # 娴嬭瘯
+<<<<<<< HEAD
 # VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
 
 #VUE_APP_API = 'https://127.0.0.1/doumeeplant/'
+=======
+#VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
+>>>>>>> 1.0.3
 
 # 婕旂ず
 VUE_APP_API = 'https://www.mes.red/api/'

--
Gitblit v1.9.3