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'

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

diff --git a/platform_web/.env.production b/platform_web/.env.production
index e616577..fc0a713 100644
--- a/platform_web/.env.production
+++ b/platform_web/.env.production
@@ -13,5 +13,10 @@
 VUE_APP_API_PREFIX = '/api/'
 
 #姝ｅ紡鐜
+<<<<<<< HEAD
 VUE_APP_BASE_URL = 'https://www.mes.red/api/'
 
+=======
+# VUE_APP_BASE_URL = 'https://www.mes.red/doumeeplant/'
+VUE_APP_BASE_URL = 'https://lingyang.mes.show:1801/doumeeplant'
+>>>>>>> dev

--
Gitblit v1.9.3