From 59a45cf5ad87bd44075069f6d53cac8e0f3e9044 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 17 Sep 2020 17:10:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=85=A5excel=E6=95=B4=E5=BD=A2?=
 =?UTF-8?q?=E5=80=BC=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/common/utils/poi/ExcelUtil.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 a315d3ac2..c5c8c0425 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
@@ -249,19 +249,19 @@ public class ExcelUtil<T>
                             }
                         }
                     }
-                    else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType))
+                    else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
                     {
                         val = Convert.toInt(val);
                     }
-                    else if ((Long.TYPE == fieldType) || (Long.class == fieldType))
+                    else if (Long.TYPE == fieldType || Long.class == fieldType)
                     {
                         val = Convert.toLong(val);
                     }
-                    else if ((Double.TYPE == fieldType) || (Double.class == fieldType))
+                    else if (Double.TYPE == fieldType || Double.class == fieldType)
                     {
                         val = Convert.toDouble(val);
                     }
-                    else if ((Float.TYPE == fieldType) || (Float.class == fieldType))
+                    else if (Float.TYPE == fieldType || Float.class == fieldType)
                     {
                         val = Convert.toFloat(val);
                     }

From 5d73b1d8deebbcc628a9eda3cf83d52f4b7f4ff3 Mon Sep 17 00:00:00 2001
From: Ricky <11748854@qq.com>
Date: Fri, 18 Sep 2020 12:13:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96$.modal.close=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/ruoyi/js/ry-ui.js        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 8450dc9d6..858e519e2 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -722,9 +722,13 @@ var table = {
             	$.modal.alert(content, modal_status.WARNING);
             },
             // 关闭窗体
-            close: function () {
-            	var index = parent.layer.getFrameIndex(window.name);
-                parent.layer.close(index);
+            close: function (index) {
+            	if($.common.isEmpty(index)){
+            		var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+            	} else {
+            		layer.close(index);
+            	}
             },
             // 关闭全部窗体
             closeAll: function () {

From 8c1e893657eb63f244acd15c9d7e5fbf4e1cec7b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 18 Sep 2020 16:42:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7springboot=E5=88=B02.1.17?=
 =?UTF-8?q?=20=E6=8F=90=E5=8D=87=E5=AE=89=E5=85=A8=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index caff0075b..fb414282c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <shiro.version>1.6.0</shiro.version>
         <thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version>
         <mybatis.boot.version>1.3.2</mybatis.boot.version>
@@ -40,7 +41,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>2.1.17.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>