From c966d9bada8e189f0beb4867fce81ae73f3fcebd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 02 八月 2020 18:31:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index 9552d0d..86141df 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -15,7 +15,7 @@
 
 /**
  * 鏂囦欢涓婁紶宸ュ叿绫�
- * 
+ *
  * @author ruoyi
  */
 public class FileUploadUtils
@@ -89,7 +89,7 @@
      *
      * @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍
      * @param file 涓婁紶鐨勬枃浠�
-     * @param extension 涓婁紶鏂囦欢绫诲瀷
+     * @param allowedExtension 涓婁紶鏂囦欢绫诲瀷
      * @return 杩斿洖涓婁紶鎴愬姛鐨勬枃浠跺悕
      * @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈�澶уぇ灏�
      * @throws FileNameLengthLimitExceededException 鏂囦欢鍚嶅お闀�
@@ -216,7 +216,7 @@
 
     /**
      * 鑾峰彇鏂囦欢鍚嶇殑鍚庣紑
-     * 
+     *
      * @param file 琛ㄥ崟鏂囦欢
      * @return 鍚庣紑鍚�
      */
@@ -229,4 +229,4 @@
         }
         return extension;
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3