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-web/src/main/java/com/iamberry/wechat/handles/integral/UseIntegralHandler.java

@@ -271,8 +271,8 @@ public class UseIntegralHandler {
         }
         /*************会员等级***************/
         Member memberInfo=memberService.getMyMemberInfo(openid);
-        HttpSession session=req.getSession();
-        session.setAttribute("memberInfo",memberInfo);
+//        HttpSession session=req.getSession();
+//        session.setAttribute("memberInfo",memberInfo);
         Integer userIntegralCount=memberInfo.getUserIntegral();
         if(userIntegralCount != null && userIntegralCount<0){
             rm.setStatus(false);