Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

tooth-wechat-web/src/main/resources/iamberry-wechat-service-orderTesk.xml

@@ -25,19 +25,19 @@
 	<bean id="closeOrder"
 		class="com.iamberry.wechat.handles.order.orderListener.OrderCloseListener" ></bean>
 		
-	<bean id="closeOrderTask"
+	<!--<bean id="closeOrderTask"
 		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject" ref="closeOrder" />
 		<property name="targetMethod" value="closeOrderByCreateTime" />
 		 <property name="concurrent" value="false" />
-	</bean>
+	</bean>-->
 	
-	<bean id="closeOrderTime"
+	<!--<bean id="closeOrderTime"
 		class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
-		<property name="jobDetail" ref="closeOrderTask" />
+		<property name="jobDetail" ref="closeOrderTask" />-->
 		<!-- cron表达式  秒 分 时 日 月  星期 年-->
-		<property name="cronExpression" value="0 0/2 * * * ?" />
-	</bean>
+		<!--<property name="cronExpression" value="0 0/50 * * * ?" />
+	</bean>-->
 	<!-- 45分钟后订单关闭end -->
 	
 	<!-- 30分钟后租赁订单关闭start -->