Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -142,8 +142,8 @@ public class MQTask implements InitializingBean {
 	 * 根据订单号拉取物流信息
 	 * @throws Exception
 	 */
-	//@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
-	@Scheduled(cron = "0 0/2 * * * ?")//每2分钟执行一次
+	@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
+	//@Scheduled(cron = "0 0/2 * * * ?")//每2分钟执行一次
 	//@Scheduled(cron = "*/10 * * * * ?")
 	public void syncLgisticsInfoByOrderId() throws Exception {
 		System.out.println("---------------- 根据订单号拉取物流信息开始 ---------------");