Commit 2ee64635f3ece797d39c2275fe6fa51222b52636
1 parent
d3963644
chore:mybatis from 3.5.11 -> 3.5.19
Showing
2 changed files
with
8 additions
and
1 deletions
pom.xml
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | <module>yudao-module-system</module> |
| 17 | 17 | <module>yudao-module-infra</module> |
| 18 | 18 | <!-- <module>yudao-module-member</module>--> |
| 19 | -<!-- <module>yudao-module-bpm</module>--> | |
| 19 | + <module>yudao-module-bpm</module> | |
| 20 | 20 | <!-- <module>yudao-module-report</module>--> |
| 21 | 21 | <!-- <module>yudao-module-mp</module>--> |
| 22 | 22 | <!-- <module>yudao-module-pay</module>--> | ... | ... |
yudao-dependencies/pom.xml
| ... | ... | @@ -23,6 +23,7 @@ |
| 23 | 23 | <knife4j.version>4.6.0</knife4j.version> |
| 24 | 24 | <!-- DB 相关 --> |
| 25 | 25 | <druid.version>1.2.24</druid.version> |
| 26 | + <mybatis.version>3.5.19</mybatis.version> | |
| 26 | 27 | <mybatis-plus.version>3.5.10.1</mybatis-plus.version> |
| 27 | 28 | <dynamic-datasource.version>4.3.1</dynamic-datasource.version> |
| 28 | 29 | <mybatis-plus-join.version>1.4.13</mybatis-plus-join.version> |
| ... | ... | @@ -174,6 +175,12 @@ |
| 174 | 175 | <version>${druid.version}</version> |
| 175 | 176 | </dependency> |
| 176 | 177 | <dependency> |
| 178 | + <!-- 注意:必须声明,避免 flowable 和 mybatis-plus 引入的 mybatis 版本不一致!!! --> | |
| 179 | + <groupId>org.mybatis</groupId> | |
| 180 | + <artifactId>mybatis</artifactId> | |
| 181 | + <version>${mybatis.version}</version> | |
| 182 | + </dependency> | |
| 183 | + <dependency> | |
| 177 | 184 | <groupId>com.baomidou</groupId> |
| 178 | 185 | <artifactId>mybatis-plus-spring-boot3-starter</artifactId> |
| 179 | 186 | <version>${mybatis-plus.version}</version> | ... | ... |