Merge branch 'master' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/CommonUtil.java

@@ -23,11 +23,8 @@ public class CommonUtil {
      * @return
      */
     public static byte[] getFileByte(String url) {
-
-        try {
-            InputStream in = new URL(url).openStream();
-            byte[] data = IOUtils.toByteArray(in);
-            return data;
+        try (InputStream in = new URL(url).openStream()) {
+            return IOUtils.toByteArray(in);
         } catch (Exception e) {
             logger.info("【异常】" + e.getMessage(), e);
         }