From 52423edb24e724acd5a55dc480a2ea10becbb632 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 13 Apr 2020 11:55:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E5=88=B0=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=89=881.2.68=20=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 .../src/main/resources/templates/demo/table/multi.html        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 579f5ddeb..a0e196bf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 		<kaptcha.version>2.3.2</kaptcha.version>
 		<swagger.version>2.9.2</swagger.version>
 		<pagehelper.boot.version>1.2.5</pagehelper.boot.version>
-		<fastjson.version>1.2.60</fastjson.version>
+		<fastjson.version>1.2.68</fastjson.version>
 		<oshi.version>3.9.1</oshi.version>
 		<commons.io.version>2.5</commons.io.version>
 		<commons.fileupload.version>1.3.3</commons.fileupload.version>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/multi.html b/ruoyi-admin/src/main/resources/templates/demo/table/multi.html
index 155f687f3..a503ec95d 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/multi.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/multi.html
@@ -35,7 +35,7 @@
 	                <i class="fa fa-remove"></i> 删除
 	            </a>
             </div>
-			<div class="col-sm-12 select-table table-striped">
+			<div class="col-xs-12 select-table table-striped">
 				<table id="bootstrap-table1"></table>
 			</div>
 		</div>
@@ -73,7 +73,7 @@
 	                <i class="fa fa-remove"></i> 删除
 	            </a>
             </div>
-			<div class="col-sm-12 select-table table-striped">
+			<div class="col-xs-12 select-table table-striped">
 				<table id="bootstrap-table2"></table>
 			</div>
 		</div>