From 895c290cbf323e107d7e50142a835e2e507b849d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 19 Aug 2020 17:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/core/page/PageDomain.java  | 4 ++--
 .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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<T>
                     {
                         if ((Double) val % 1 > 0)
                         {
-                            val = new DecimalFormat("0.00").format(val);
+                            val = new BigDecimal(val.toString());
                         }
                         else
                         {