Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

 ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java

@@ -20,8 +20,8 @@

    @Test
    public void testExcelImport() throws Exception {
        InputStream is = new FileInputStream(new File("D:\\test.xlsx"));
        ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
        List<ZfProperty> userList = util.importExcel(is);
//        InputStream is = new FileInputStream(new File("D:\\test.xlsx"));
//        ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
//        List<ZfProperty> userList = util.importExcel(is);
    }
}