mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2025-12-08 17:12:28 +08:00
Merge remote-tracking branch 'origin/springboot3' into springboot3-satoken
# Conflicts: # .gitignore
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@ os_del_doc.cmd
|
|||||||
.svn
|
.svn
|
||||||
derby.log
|
derby.log
|
||||||
.cursor
|
.cursor
|
||||||
|
.history
|
||||||
@ -59,8 +59,8 @@
|
|||||||
<liteflow.version>2.15.0</liteflow.version>
|
<liteflow.version>2.15.0</liteflow.version>
|
||||||
|
|
||||||
<!-- 积木报表-->
|
<!-- 积木报表-->
|
||||||
<jimureport-spring-boot-starter.version>2.1.3</jimureport-spring-boot-starter.version>
|
<jimureport-spring-boot-starter.version>2.1.5</jimureport-spring-boot-starter.version>
|
||||||
<jimubi-spring-boot-starter.version>2.1.4</jimubi-spring-boot-starter.version>
|
<jimubi-spring-boot-starter.version>2.1.5</jimubi-spring-boot-starter.version>
|
||||||
<minidao.version>1.10.14</minidao.version>
|
<minidao.version>1.10.14</minidao.version>
|
||||||
<autopoi-web.version>1.4.18</autopoi-web.version>
|
<autopoi-web.version>1.4.18</autopoi-web.version>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user