From bd4814581a413c1b142544d096c9a73895f824af Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Tue, 24 May 2022 17:20:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E8=87=B31.2.83=EF=BC=8C=E8=A7=A3=E5=86=B3fastjson=E4=BD=8E?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=AB=98=E5=8D=B1=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecg-boot/jeecg-boot-module-system/pom.xml | 6 ++++++
 jeecg-boot/pom.xml                          | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml
index 7e2de71b..93df4e40 100644
--- a/jeecg-boot/jeecg-boot-module-system/pom.xml
+++ b/jeecg-boot/jeecg-boot-module-system/pom.xml
@@ -53,6 +53,12 @@
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-spring-boot-starter</artifactId>
 			<version>1.5.0-beta</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>fastjson</artifactId>
+					<groupId>com.alibaba</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- DEMO 示例模块 -->
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index 0fe1c7f1..b9cea280 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -25,7 +25,7 @@
 		<alibaba.nacos.version>2.0.4</alibaba.nacos.version>
 
 		<xxl-job-core.version>2.2.0</xxl-job-core.version>
-        <fastjson.version>1.2.78</fastjson.version>
+        <fastjson.version>1.2.83</fastjson.version>
 		<knife4j-spring-boot-starter.version>3.0.3</knife4j-spring-boot-starter.version>
 		<knife4j-spring-ui.version>2.0.9</knife4j-spring-ui.version>
 		<!-- 数据库驱动 -->
@@ -324,7 +324,7 @@
 			<dependency>
 				<groupId>org.jeecgframework</groupId>
 				<artifactId>jeewx-api</artifactId>
-				<version>1.4.7</version>
+				<version>1.4.8</version>
 				<exclusions>
 					<exclusion>
 						<artifactId>commons-beanutils</artifactId>