Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-07-02 d6ca9e548d9c11be3281de1ddae392e276dc2a3d

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

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

        finally

        {

            IOUtils.closeQuietly(in);

            IOUtils.closeQuietly(baos);

        }

    }