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 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

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

--
Gitblit v1.9.3