diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java index e6dd98e2..23f1f8bd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java @@ -18,8 +18,8 @@ public class PageDomain /** 排序列 */ private String orderByColumn; - /** 排序的方向 "desc" 或者 "asc". */ - private String isAsc; + /** 排序的方向desc或者asc */ + private String isAsc = "asc"; public String getOrderBy() { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index b7764e15..5ab7ca32 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -923,7 +923,7 @@ public class ExcelUtil { if ((Double) val % 1 > 0) { - val = new DecimalFormat("0.00").format(val); + val = new BigDecimal(val.toString()); } else {