Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-08-10 4044ed23eafc9d8c8c7b5e82b2b7107cc32345b5

 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -476,7 +476,7 @@
    {

        if (ColumnType.STRING == attr.cellType())

        {

            cell.setCellType(CellType.NUMERIC);

            cell.setCellType(CellType.STRING);

            cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());

        }

        else if (ColumnType.NUMERIC == attr.cellType())