Merge branch 'master' of http://git.iamberry.com/wangxiaoming/iamberry-wechat

wechat-wechat-web/src/main/resources/ioc.xml

@@ -37,7 +37,7 @@
     <!-- 将30天后奖励积分的定时任务的xml引入-->
 	<!--<import resource="classpath:iamberry-wechat-service-orderTesk.xml"></import>-->
 	
-	<import resource="classpath:datasource.xml"/>
+	<import resource="classpath:jdbc.xml"/>
 	
 	<!-- spring监控 -->
     <bean id="druid-stat-interceptor" class="com.alibaba.druid.support.spring.stat.DruidStatInterceptor"></bean>