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

@@ -147,19 +147,6 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				}
 	}
 
-
-	public void main(String[] args) throws Exception {
-		MQMessage message = new MQMessage();
-		String orderIdMD5 = "11231232132131311";
-		message.setServiceToMessage(orderIdMD5);
-		message.setServiceOtherMessage("efast.trade.new.add");
-		message.setServiceIsSend(2);			// 没有推送的信息
-		message.setServiceStatus(1); 			// 推送成功
-		message.setServiceType(1); 				// 添加订单信息
-		Boolean bl = addOrderInfoToEfast(message);
-		System.out.println("hello + bl:"+bl);
-	}
-
 	@Override
 	public boolean addOrderInfoToEfast(MQMessage message) throws Exception {