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

# Conflicts:
#	iamberry-wechat-web/src/main/java/com/iamberry/wechat/filters/WechatFilter.java

iamberry-wechat-web/src/main/webapp/common/wechat/shopping-cart.html

@@ -139,7 +139,7 @@
 						} else {
 							if(dt.status) {
 								console.log(dt)
-								
+
 							} else {
 								mui.alert("获取数据失败！");
 							}