From 35614ee145b439a812549db272b034ee81f4ced8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:42:13 +0800
Subject: [PATCH] 小程序

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

diff --git a/platform_web/.env.development b/platform_web/.env.development
index 580425f..33255d4 100644
--- a/platform_web/.env.development
+++ b/platform_web/.env.development
@@ -22,6 +22,7 @@
 #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/'
@@ -36,3 +37,8 @@
 # #姝ｅ紡鐜
 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