From 1c84565d624ad0cce0576a22d0323cf3181d49cd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:56:28 +0800
Subject: [PATCH] Merge branch 'dev'

---
 h5_standard/.env |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/h5_standard/.env b/h5_standard/.env
index 4e27e94..d6d4c1e 100644
--- a/h5_standard/.env
+++ b/h5_standard/.env
@@ -1,5 +1,13 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+# 鎺ュ彛鍓嶇紑  _api_api_test
+=======
 # 鎺ュ彛鍓嶇紑  _api
-VUE_APP_API_PREFIX = '/doumeeplant_api'
+>>>>>>> 1.0.3
+=======
+# 鎺ュ彛鍓嶇紑  _api_api_test
+>>>>>>> dev
+VUE_APP_API_PREFIX = '/api'
 
 # 涓婁笅鏂囪矾寰� --> 榛樿./锛堝彲浠ラ儴缃插湪鏈嶅姟鍣ㄤ换鎰忚矾寰勶級
 VUE_APP_CONTEXT = './'

--
Gitblit v1.9.3