Merge remote-tracking branch 'origin/master'

chenjiahe

2023-12-04 d9fe4b6ff40a964c895a452ea12a04a13a979ec4

 src/main/java/com/hx/util/ExcelUtil.java

@@ -916,7 +916,10 @@
               .open(new BufferedInputStream(file.getInputStream()));

         listData =readhandle(book);
      }catch (Exception e){
      }catch (OLE2NotOfficeXmlFileException ex){
         ex.printStackTrace();
         throw new RuntimeException("excel版本不为2007及以上");
      } catch (Exception e){
         e.printStackTrace();
         throw new RuntimeException(e.getMessage());
      }
@@ -941,6 +944,9 @@
               .open(file);

         listData =readhandle(book);
      }catch (OLE2NotOfficeXmlFileException ex){
         ex.printStackTrace();
         throw new RuntimeException("excel版本不为2007及以上");
      }catch (Exception e){
         e.printStackTrace();
         throw new RuntimeException(e.getMessage());