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.development |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/h5_standard/.env.development b/h5_standard/.env.development
index 87e8ae9..9694782 100644
--- a/h5_standard/.env.development
+++ b/h5_standard/.env.development
@@ -4,23 +4,39 @@
 # 娴嬭瘯鏈嶅姟鍣�
 # VUE_APP_API = 'http://139.186.142.91:10012/'
 
-VUE_APP_API = 'https://www.mes.red/doumeeplant/'
+# VUE_APP_API = 'https://www.mes.red/doumeeplant/'
 
 # 姝e紡鏈嶅姟鍣�
 # VUE_APP_API = 'https://106.14.220.133:10012/'
 
 # 钀嶅鏈湴
-# VUE_APP_API = 'http://192.168.0.12:10012/'
+<<<<<<< HEAD
+<<<<<<< HEAD
+#  VUE_APP_API = 'http://192.168.3.219:10021/'
+=======
+ VUE_APP_API = 'http://192.168.3.219:10021/'
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
+=======
+#  VUE_APP_API = 'http://192.168.3.219:10021/'
+>>>>>>> 1.0.3
 
 # 浠诲悍鏈湴
 # VUE_APP_API = 'http://192.168.0.15:10021/'
 # VUE_APP_API = 'http://192.168.0.127:10021/'
 
-# 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://dmtest.ahapp.net/doumeeplant_api/'
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
+=======
+VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
+>>>>>>> 1.0.3
 
 # VUE_APP_API = 'http://192.168.0.13:10012/'
 
-# VUE_APP_API = 'http://192.168.0.15:10012/'
+# VUE_APP_API = 'http://192.168.0.15:10021/'
 
 # 鍒樼纾�
 # VUE_APP_API = 'http://192.168.0.18:10012/'
\ No newline at end of file

--
Gitblit v1.9.3