Authored by DengXinFei

Merge branch 'dev05.30-4.5' into test

... ... @@ -4,7 +4,7 @@
<parent>
<groupId>com.yoho</groupId>
<artifactId>parent</artifactId>
<version>1.0.9-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>com.yoho.dsf</groupId>
... ...
... ... @@ -10,7 +10,7 @@
<!-- Only one context -->
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>classpath*:META-INF/spring/spring-mybatis-datasource.xml,classpath*:META-INF/spring/spring*.xml</param-value>
<param-value>classpath*:META-INF/spring/mybatis-datasource.xml,classpath*:META-INF/spring/spring*.xml</param-value>
</context-param>
<servlet-mapping>
... ...