Merge remote-tracking branch 'origin/master'

疯狂的狮子li

2021-03-15 46aa17db9cc277c821c46c82650e7e3cbda97004

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

@@ -1059,7 +1059,7 @@
                    }

                    else

                    {

                        if ((Double) val % 1 > 0)

                        if ((Double) val % 1 != 0)

                        {

                            val = new BigDecimal(val.toString());

                        }