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

疯狂的狮子li

2021-06-02 a961fff69d5ae4e1a7393bc0d4b4ce85f7bcbf9f

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

 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java

@@ -95,6 +95,7 @@
        }

        finally

        {

            IOUtils.closeQuietly(in);

            IOUtils.closeQuietly(baos);

        }

    }