Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus

疯狂的狮子li

2021-06-23 1488a09b8ee6a4f4980a25dada3425f9894d8327

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

@@ -513,7 +513,10 @@
        }

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

        {

            cell.setCellValue(StrUtil.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));

            if (Validator.isNotNull(value))

            {

                cell.setCellValue(StrUtil.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));

            }

        }

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

        {