Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-17 abdd896a66eced1355a24ea5eabbee497a745fe5

 src/main/java/com/mindskip/xzs/utility/excel/ExcelUtils.java

@@ -875,6 +875,12 @@
            cell.setCellValue("");
            return CELL_OTHER;
        }
        // 数据为""时
        if ("".equals(o)) {
            cell.setCellType(CellType.STRING);
            cell.setCellValue("");
            return CELL_OTHER;
        }
        // 是否为字符串
        if (o instanceof String) {
            String s = o.toString();