Skip to content

M
matrix
Commit 68407f58 by 共享中心代码生成
Options

Merge branch 'dev_2.0.1' into 'master' 

Dev 2.0.1

See merge request mall/arch/matrix!65
parents 09d22dd5 e8247d55
Showing with 1 additions and 1 deletions
matrix-mybatis/matrix-mybatis-starter/src/main/java/com/secoo/mall/mybatis/spring/boot/autoconfigure/MatrixMybatisAutoConfiguration.java
...@@ -45,7 +45,7 @@ public class MatrixMybatisAutoConfiguration { ...@@ -45,7 +45,7 @@ public class MatrixMybatisAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(SqlSessionFactory.class) @ConditionalOnMissingBean(SqlSessionFactory.class)
public SqlSessionFactory sqlSessionFactory(DataSource dataSource, MatrixMybatisGlobalConfig globalConfig, MybatisConfiguration mybatisConfiguration) throws Exception { public SqlSessionFactory sqlSessionFactory(DataSource dataSource, GlobalConfig globalConfig, MybatisConfiguration mybatisConfiguration) throws Exception {
MatrixMybatisSqlSessionFactoryBean factory = new MatrixMybatisSqlSessionFactoryBean(); MatrixMybatisSqlSessionFactoryBean factory = new MatrixMybatisSqlSessionFactoryBean();
if (this.properties.getConfigurationProperties() != null) { if (this.properties.getConfigurationProperties() != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment