Merge remote-tracking branch 'origin/master'

沈斌

2017-11-06 1cbd89e5aceb71e990c42b8599e45f2703588878

 src/main/resources/spring/database.xml

@@ -23,7 +23,7 @@
    </bean>



    <bean id="sqlSessionFactoryMain" name="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">

        <property name="configLocation" value="classpath:mybatis.xml"/>

        <property name="configLocation" value="classpath:mybatis/mybatis.xml"/>

        <property name="mapperLocations" value="classpath:mapper/*.xml" />

        <property name="dataSource" ref="dataSource"/>

    </bean>