Merge remote-tracking branch 'origin/springboot3' into springboot3-satoken

# Conflicts: # .gitignore
更新jimureport和jimubi的版本号至2.1.5
2026-02-04 17:45:34 +08:00 · 2025-10-22 09:38:00 +08:00 · 2025-10-21 17:44:28 +08:00 · 2025-10-17 19:31:53 +08:00 · 2025-10-16 19:13:47 +08:00 · 2025-10-16 19:12:11 +08:00
2 changed files with 3 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,3 +14,4 @@ os_del_doc.cmd
 .svn
 derby.log
 .cursor
+.history
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@ -59,8 +59,8 @@
 		<liteflow.version>2.15.0</liteflow.version>
 		
 		<!-- 积木报表-->
-		<jimureport-spring-boot-starter.version>2.1.3</jimureport-spring-boot-starter.version>
-		<jimubi-spring-boot-starter.version>2.1.4</jimubi-spring-boot-starter.version>
+		<jimureport-spring-boot-starter.version>2.1.5</jimureport-spring-boot-starter.version>
+		<jimubi-spring-boot-starter.version>2.1.5</jimubi-spring-boot-starter.version>
 		<minidao.version>1.10.14</minidao.version>
 		<autopoi-web.version>1.4.18</autopoi-web.version>
Author	SHA1	Message	Date
JEECG	21585e4d25	Merge remote-tracking branch 'origin/springboot3' into springboot3-satoken # Conflicts: # .gitignore	2025-10-22 09:38:00 +08:00
JEECG	c9fc948658	更新jimureport和jimubi的版本号至2.1.5	2025-10-21 17:44:28 +08:00
JEECG	b97d041e7f	更新springboot3版本号	2025-10-17 19:31:53 +08:00
JEECG	6492f2c99a	更新README.md，修正Sa-Token下载链接格式	2025-10-16 19:13:47 +08:00
JEECG	bf32385a06	更新README.md，调整下载链接顺序	2025-10-16 19:12:11 +08:00
JEECG	6ef637c46f	提供SpringBoot3.3 + Sa-Token版本	2025-10-16 19:05:59 +08:00