From 2ef70303c5f1808afd3507ee934b3f32df8e9b3c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 29 七月 2021 13:11:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index a7a152e..4a52958 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -9,13 +9,11 @@
   # 瀹炰緥婕旂ず寮�鍏�
   demoEnabled: true
   # 鏂囦欢璺緞
-  profile: ./ruoyi/server/uploadPath
+  profile: ./ruoyi/uploadPath
   # 鑾峰彇ip鍦板潃寮�鍏�
   addressEnabled: true
 
 captcha:
-  # 楠岃瘉鐮佸紑鍏�
-  enabled: true
   # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
   type: math
   # line 绾挎骞叉壈 circle 鍦嗗湀骞叉壈 shear 鎵洸骞叉壈

--
Gitblit v1.9.3