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

@@ -42,7 +42,7 @@
 	<!-- 获取个人信息-->
 	<select id="getMyMemberInfo"  parameterType="String" resultType="Member" >
 		SELECT
-			user_head,user_nickname,user_sex,user_name,user_birth_date,user_tel,user_age_stage,user_identity
+			user_head,user_nickname,user_sex,user_name,user_birth_date,user_tel,user_age_stage,user_identity,
 			user_integral,user_stay_integral,user_use_integral,user_surplus_integral
 		FROM TB_IAMBERRY_USER_USERINFO
 		WHERE user_openid = #{userOpenid}