From 9159e2ed2293722db0c9a42024c00d38c1a2cd62 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 五月 2021 09:16:28 +0800
Subject: [PATCH] fix vue与boot整合打包与admin页面路由冲突

---
 ruoyi-admin/src/main/resources/application.yml |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8500728..6ab3030 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -79,6 +79,10 @@
     restart:
       # 鐑儴缃插紑鍏�
       enabled: true
+  # 涓巚ue鏁村悎閮ㄧ讲浣跨敤
+  thymeleaf:
+    # 灏嗙郴缁熸ā鏉挎斁缃埌鏈�鍓嶉潰 鍚﹀垯浼氫笌 springboot-admin 椤甸潰鍐茬獊
+    template-resolver-order: 1
   application:
     name: ruoyi-vue-plus
   boot:

--
Gitblit v1.9.3