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

maven

11 小时以前 1771247044364d5d8ec06cf71d86356c90ec8388

 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");

                        }

@@ -550,6 +550,8 @@
        this.init(list, sheetName, title, Type.EXPORT);

        return exportExcel();

    }







    /**

     * 对list数据源将其里面的数据导入到excel表单

@@ -1458,7 +1460,7 @@


    /**

     * 获取下载路径

     * 
     *

     * @param filename 文件名称

     */

    public String getAbsoluteFile(String filename)