Merge branch 'dev_2.0.1' into 'master'

Dev 2.0.1

See merge request mall/arch/matrix!65

matrix-mybatis/matrix-mybatis-starter/src/main/java/com/secoo/mall/mybatis/spring/boot/autoconfigure/MatrixMybatisAutoConfiguration.java

@@ -45,7 +45,7 @@ public class MatrixMybatisAutoConfiguration {
 
     @Bean
     @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();
 
         if (this.properties.getConfigurationProperties() != null) {