From a69578ed877252e70d45d4753258b3d7b6937606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:24:34 +0800
Subject: [PATCH] a

---
 platform_web/.env.development |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/platform_web/.env.development b/platform_web/.env.development
index 3b927e6..580425f 100644
--- a/platform_web/.env.development
+++ b/platform_web/.env.development
@@ -21,6 +21,18 @@
 #鐒︽澗
 #VUE_APP_BASE_URL = 'http://192.168.0.36:10021/'
 
+<<<<<<< HEAD
 #浠诲悍鏈湴
 VUE_APP_BASE_URL = 'http://192.168.0.15:10021/'
-# VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
\ No newline at end of file
+# VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
+=======
+#鍒樼纾婃湰鍦�
+# VUE_APP_BASE_URL = 'http://192.168.0.18:10021/'
+VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
+
+# # 鎺ュ彛鍓嶇紑
+# VUE_APP_API_PREFIX = '/doumeeplant/'
+
+# #姝ｅ紡鐜
+VUE_APP_BASE_URL = 'https://lingyang.mes.show:1801/doumeeplant/'
+>>>>>>> 1.0.3

--
Gitblit v1.9.3