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

疯狂的狮子li

2021-04-25 4e723f4936289ae14cd2b8adfbc135d7edcef71b

 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 (StrUtil.isNotNull(value))

            {

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

            }

        }

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

        {