admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-08 01:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #187 from lcxw/main

Browse Source 
fix: 与spring-data-jpa混用时候，提醒`No bean named 'transactionManager' avail…
This commit is contained in:
Michael Yang 2023-10-17 11:22:39 +08:00 committed by GitHub
commit 177129579e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/FlexTransactionAutoConfiguration.java
View File

@ -46,7 +46,7 @@ public class FlexTransactionAutoConfiguration implements TransactionManagementCo
*/ */
private final FlexTransactionManager flexTransactionManager = new FlexTransactionManager(); private final FlexTransactionManager flexTransactionManager = new FlexTransactionManager();
@Bean @Bean(name = "transactionManager")
@Override @Override
public PlatformTransactionManager annotationDrivenTransactionManager() { public PlatformTransactionManager annotationDrivenTransactionManager() {
return flexTransactionManager; return flexTransactionManager;