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

@@ -95,7 +95,10 @@
 		ug.user_gift_count userGiftCount,
 		ug.user_status userStatus,
 		ug.user_create_time userCreateTime,
-		pi.product_name productName
+		pi.product_name giftName,
+		pi.product_color giftColorName,
+		pi.product_child_type giftChildType,
+		pi.Product_introduce_img giftProductPic
 		FROM
 		tb_iamberry_sales_user_gift ug
 		LEFT JOIN tb_iamberry_product_color pc on pc.color_id = #{cartColorId}