From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug

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

diff --git a/platform_web/.env.development b/platform_web/.env.development
index 3b927e6..33255d4 100644
--- a/platform_web/.env.development
+++ b/platform_web/.env.development
@@ -21,6 +21,24 @@
 #鐒︽澗
 #VUE_APP_BASE_URL = 'http://192.168.0.36:10021/'
 
+<<<<<<< HEAD
+<<<<<<< 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
+=======
+#浠诲悍鏈湴
+VUE_APP_BASE_URL = 'http://192.168.0.15:10021/'
+VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
+>>>>>>> dev

--
Gitblit v1.9.3