From 9342bbef5659a43114193a725a96ad852eec7a79 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 17 九月 2021 23:39:27 +0800
Subject: [PATCH] fix 修复合并错误

---
 ruoyi-ui/.env.development |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index 18b2a3e..a1a508d 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -1,11 +1,14 @@
-# 椤甸潰鏍囬
-VUE_APP_TITLE = 鑻ヤ緷绠＄悊绯荤粺
-
-# 寮�鍙戠幆澧冮厤缃�
-ENV = 'development'
-
-# 鑻ヤ緷绠＄悊绯荤粺/寮�鍙戠幆澧�
-VUE_APP_BASE_API = '/dev-api'
-
-# 璺敱鎳掑姞杞�
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
+# 椤甸潰鏍囬
+VUE_APP_TITLE = RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺
+
+# 寮�鍙戠幆澧冮厤缃�
+ENV = 'development'
+
+# 鑻ヤ緷绠＄悊绯荤粺/寮�鍙戠幆澧�
+VUE_APP_BASE_API = '/dev-api'
+
+# 鐩戞帶鍦板潃
+VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login'
+
+# 璺敱鎳掑姞杞�
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

--
Gitblit v1.9.3