Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Conflicts: ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
4 years ago · a961fff69d
parent 45fe77ce4a b7f3c68eca
commit a961fff69d
1 changed files with 1 additions and 0 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
@ -95,6 +95,7 @@ public class ImageUtils
        }
        finally
        {
+            IOUtils.closeQuietly(in);
            IOUtils.closeQuietly(baos);
        }
    }