Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/StayIntegral.java

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productInfoMapper.xml

@@ -65,7 +65,7 @@
 		PRODUCT_NAME productName
 		FROM tb_iamberry_product_info PI
 		LEFT JOIN tb_iamberry_product_color PC ON PC.color_product_id=PI.PRODUCT_ID
-		WHERE PI.PRODUCT_TYPE=#{productType} AND PI.product_status=1
+		WHERE PI.PRODUCT_TYPE=#{productType} AND PC.COLOR_STATUS=1
 		ORDER BY PI.product_sort_num
 		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
 			limit ${page.recordBegin},${page.pageSize}