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/cartMapper.xml

@@ -24,7 +24,7 @@ PUBLIC
 			pc.color_id
 		FROM
 			TB_IAMBERRY_SHOP_CART C
-			LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P ON C.CART_PRODUCT_ID = P.PRODUCT_ID
+			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR  pc on C.CART_PRODUCT_ID = pc.color_product_id and C.cart_color_id = pc.color_id
 			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR  pc on C.CART_PRODUCT_ID = pc.color_product_id
 		WHERE
 			C.CART_OPENID = #{openId}