From 5827b913fa8013926fc208faa5dbb34c899fdf26 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:23:22 +0800
Subject: [PATCH] 小程序

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

diff --git a/h5_standard/.env.development b/h5_standard/.env.development
index f16c4b1..5dda2b4 100644
--- a/h5_standard/.env.development
+++ b/h5_standard/.env.development
@@ -10,13 +10,21 @@
 # VUE_APP_API = 'https://106.14.220.133:10012/'
 
 # 钀嶅鏈湴
+<<<<<<< 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.0.15:10021/'
 # VUE_APP_API = 'http://192.168.0.127:10021/'
 
+<<<<<<< HEAD
 VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
+=======
+#VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
 
 # VUE_APP_API = 'http://192.168.0.13:10012/'
 

--
Gitblit v1.9.3