Merge remote-tracking branch 'origin/jtwy' into jtwy

zss

昨天 afacb4a693c3b7e40ccdd55bc403850709ff8a34

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

@@ -428,7 +428,7 @@
                    if (String.class == fieldType)

                    {

                        String s = Convert.toStr(val);

                        if (StringUtils.endsWith(s, ".0"))

                        if (s.matches("^\\d+\\.0$"))

                        {

                            val = StringUtils.substringBefore(s, ".0");

                        }