pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2025-12-26 16:26:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
This commit is contained in:
JEECG
2025-09-28 21:59:14 +08:00
parent aa55c3a86c ae4363dc72
commit 0bfe5689cc
7 changed files with 103573 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-boot/pom.xml
View File

@ -60,7 +60,7 @@
<!-- 积木报表-->
<jimureport-spring-boot-starter.version>2.1.3</jimureport-spring-boot-starter.version>
<jimubi-spring-boot-starter.version>2.1.3</jimubi-spring-boot-starter.version>
<jimubi-spring-boot-starter.version>2.1.4</jimubi-spring-boot-starter.version>
<minidao.version>1.10.14</minidao.version>
<autopoi-web.version>1.4.18</autopoi-web.version>
@ -436,7 +436,7 @@
<!-- 积木报表-->
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId>
<artifactId>jimureport-spring-boot3-starter</artifactId>
<version>${jimureport-spring-boot-starter.version}</version>
<exclusions>
<exclusion>
@ -489,7 +489,7 @@
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-nosql-starter</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.calcite</groupId>