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-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java

@@ -149,7 +149,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 
 	@Override
 	public boolean addOrderInfoToEfast(MQMessage message) throws Exception {
-		
+		logger.info("WaterPF addOrderInfoToEfast begin...");
 		// orderInfo
 		Order order = adminOrderService.getShopOrderByOrderId(message.getServiceToMessage());
 		if (order == null || order.getSalesOrderid() == null) {
@@ -316,6 +316,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		throw e;
 
 	}
+
 	}