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-service/src/main/java/com/iamberry/wechat/service/mapper/productInfoMapper.xml

@@ -70,6 +70,7 @@
 			<if test="otherInt != null and otherInt != ''">
 				AND tb_iamberry_product_child_type.type_id  = #{otherInt}
 			</if>
+			GROUP BY TB_IAMBERRY_PRODUCT_INFO.PRODUCT_ID
 			ORDER BY PRODUCT_CREATE_DATE DESC 
 		LIMIT 
 			#{minNum},#{maxNum}

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java

@@ -93,7 +93,7 @@ public class CartHandlers {
 		ResultMsg remsg = new ResultMsg();
 		Member member =  wechatUtils.getUserBySession(request);
 		List<CartDto> cartList = cartService.selectCartByOpenId(member.getUserOpenid());
-		
+
 		/*
 		 * 金额统计
 		 */