From 51251331cf9650c2fb81cc5efbfd53a512db9868 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 14 Oct 2021 11:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7oshi=E5=88=B0=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=ACv5.8.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                |  4 ++--
 .../main/resources/templates/tool/gen/importTable.html | 10 ++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0a9cab948..1745df408 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,8 @@
         <mybatis-spring-boot.version>2.2.0</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.4.0</pagehelper.boot.version>
         <fastjson.version>1.2.78</fastjson.version>
-        <oshi.version>5.8.0</oshi.version>
-        <jna.version>5.8.0</jna.version>
+        <oshi.version>5.8.2</oshi.version>
+        <jna.version>5.9.0</jna.version>
         <commons.io.version>2.11.0</commons.io.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <poi.version>4.1.2</poi.version>
diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html b/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html
index e7c536715..b432702f1 100644
--- a/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html
+++ b/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html
@@ -37,8 +37,6 @@
 		$(function() {
 		    var options = {
 		        url: prefix + "/db/list",
-		        // sortName: "createTime",
-		        // sortOrder: "desc",
 		        showSearch: false,
 		        showRefresh: false,
 		        showToggle: false,
@@ -59,7 +57,6 @@
 		        {
 		            field: 'tableName',
 		            title: '表名称',
-		            sortable: true,
 		            formatter: function(value, row, index) {
                     	return $.table.tooltip(value);
                     }
@@ -67,20 +64,17 @@
 		        {
 		            field: 'tableComment',
 		            title: '表描述',
-		            sortable: true,
 		            formatter: function(value, row, index) {
                     	return $.table.tooltip(value);
                     }
 		        },
 		        {
 		            field: 'createTime',
-		            title: '创建时间',
-		            sortable: true
+		            title: '创建时间'
 		        },
 		        {
 		            field: 'updateTime',
-		            title: '更新时间',
-		            sortable: true
+		            title: '更新时间'
 		        }]
 		    };
 		    $.table.init(options);