Merge branch 'master' of E:\jeeexam\RuoYi with conflicts.

2019-01-10 23:47:52 +08:00 · 2019-01-10 23:47:52 +08:00 · 604873a764
parent f548eb7fa1
commit 604873a764
1 changed files with 133 additions and 133 deletions
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@ -59,8 +59,8 @@ spring:
  # 文件上传
  servlet:
     multipart:
-       max-file-size:  300MB
+       max-file-size:  30MB
-       max-request-size:  300MB
+       max-request-size:  30MB
  # 服务模块
  devtools:
    restart: