Skip to content

Commit

Permalink
Merge pull request jeecgboot#5698 from EightMonth/springboot3
Browse files Browse the repository at this point in the history
更新积木报表、Minidao支持Springboot3版本
  • Loading branch information
zhangdaiscott authored Dec 20, 2023
2 parents b953744 + 32876e1 commit 7f6c1c2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions jeecg-module-system/jeecg-system-biz/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -332,14 +332,14 @@
</dependency>
<!-- minidao -->
<dependency>
<groupId>org.jeecgframework</groupId>
<groupId>org.jeecgframework.boot3</groupId>
<artifactId>minidao-spring-boot-starter</artifactId>
<version>${minidao.version}</version>
</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>
Expand Down

0 comments on commit 7f6c1c2

Please sign in to comment.