From e9514873d26f6ca4f8981aa35b41ae9ac63eedf0 Mon Sep 17 00:00:00 2001
From: kezhijie <kezhijie@wuhandsj.com>
Date: Tue, 19 Dec 2023 14:31:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A7=AF=E6=9C=A8?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=94=AF=E6=8C=81springboot3=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecg-module-system/jeecg-system-biz/pom.xml | 10 +++++-----
 pom.xml                                      |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-module-system/jeecg-system-biz/pom.xml
index c338372c5..4f80fd431 100644
--- a/jeecg-module-system/jeecg-system-biz/pom.xml
+++ b/jeecg-module-system/jeecg-system-biz/pom.xml
@@ -30,20 +30,20 @@
 			<artifactId>jeewx-api</artifactId>
 		</dependency>
 		<!-- 积木报表 -->
-		<!--<dependency>
+		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
-			<artifactId>jimureport-spring-boot-starter</artifactId>
-		</dependency>-->
+			<artifactId>jimureport-spring-boot3-starter</artifactId>
+		</dependency>
 		<!--<dependency>
 			<groupId>org.jeecgframework.boot</groupId>
 			<artifactId>drag-free</artifactId>
 			<version>1.0.2</version>
 		</dependency>-->
-		<!-- 积木报表 mongo redis 支持包 
+		<!-- 积木报表 mongo redis 支持包 -->
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-nosql-starter</artifactId>
-		</dependency>-->
+		</dependency>
 	</dependencies>
 	
 </project>
diff --git a/pom.xml b/pom.xml
index e4978137a..18e988747 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
 		<minidao.version>1.9.5</minidao.version>
 
 		<!-- 积木报表-->
-		<jimureport-spring-boot-starter.version>1.6.4</jimureport-spring-boot-starter.version>
+		<jimureport-spring-boot-starter.version>1.6.6-beta2</jimureport-spring-boot-starter.version>
 		<commons.version>2.6</commons.version>
 		<aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
 		<aliyun.oss.version>3.11.2</aliyun.oss.version>
@@ -331,15 +331,15 @@
 				</exclusions>
 			</dependency>
 			<!-- minidao -->
-			<dependency>
+			<!--<dependency>
 				<groupId>org.jeecgframework</groupId>
 				<artifactId>minidao-spring-boot-starter</artifactId>
 				<version>${minidao.version}</version>
-			</dependency>
+			</dependency>-->
 			<!-- 积木报表-->
 			<dependency>
 				<groupId>org.jeecgframework.jimureport</groupId>
-				<artifactId>jimureport-spring-boot-starter</artifactId>
+				<artifactId>jimureport-spring-boot3-starter</artifactId>
 				<version>${jimureport-spring-boot-starter.version}</version>
 				<exclusions>
 					<exclusion>

From 1667b141947abd2651ba7c64cc79b00831f1b17f Mon Sep 17 00:00:00 2001
From: kezhijie <kezhijie@wuhandsj.com>
Date: Wed, 20 Dec 2023 10:00:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0minidao=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?springboot3=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 18e988747..0a33359ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,11 +331,11 @@
 				</exclusions>
 			</dependency>
 			<!-- minidao -->
-			<!--<dependency>
-				<groupId>org.jeecgframework</groupId>
+			<dependency>
+				<groupId>org.jeecgframework.boot3</groupId>
 				<artifactId>minidao-spring-boot-starter</artifactId>
 				<version>${minidao.version}</version>
-			</dependency>-->
+			</dependency>
 			<!-- 积木报表-->
 			<dependency>
 				<groupId>org.jeecgframework.jimureport</groupId>