From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug

---
 h5_standard/.env.production |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/h5_standard/.env.production b/h5_standard/.env.production
index af03e19..86f47b4 100644
--- a/h5_standard/.env.production
+++ b/h5_standard/.env.production
@@ -18,7 +18,19 @@
 # VUE_APP_API = 'https://hsky.doumee.com/doumeeplant_api/'
 
 # 娴嬭瘯
-VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
+<<<<<<< HEAD
+<<<<<<< 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://dmtest.ahapp.net/doumeeplant_api_test/'
+
+#VUE_APP_API = 'https://127.0.0.1/doumeeplant/'
+>>>>>>> dev
 
 # 婕旂ず
-# VUE_APP_API = 'https://www.mes.red/doumeeplant/'
+VUE_APP_API = 'https://www.mes.red/api/'

--
Gitblit v1.9.3