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

@@ -173,7 +173,7 @@ public class MQTask implements InitializingBean {
 					JSONObject jsonObject = JSONObject.fromObject(result);
 					String msg = jsonObject.getString("msg");
 					logger.info("---------"+msg+"---------");
-					if ("seccess".equals(msg)) {
+					if ("success".equals(msg)) {
 						String salesPostFirm = jsonObject.getString("salesPostFirm");
 						String salesPostNum = jsonObject.getString("salesPostNum");
 						order.setSalesPostFirm(salesPostFirm);

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

@@ -175,7 +175,7 @@ public class MQTask implements InitializingBean {
 					JSONObject jsonObject = JSONObject.fromObject(result);
 					String msg = jsonObject.getString("msg");
 					logger.info("---------"+msg+"---------");
-					if ("seccess".equals(msg)) {
+					if ("success".equals(msg)) {
 						String salesPostFirm = jsonObject.getString("salesPostFirm");
 						String salesPostNum = jsonObject.getString("salesPostNum");
 						order.setSalesPostFirm(salesPostFirm);