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

@@ -228,9 +228,8 @@ public class UseIntegralHandler {
         /**************未发货数量*****************/
         Integer notSendCount=adminOrderService.getNotSendCount(openid);
 
-        map.put("lists",lists);
+        map.put("listRankRule",lists);
         map.put("notSendCount",notSendCount);
-        map.put("rankRule",lists.get(0));
         map.put("member",memberInfo);
         rm.setStatus(true);
         rm.setResultCode(ResultInfo.SUCCESSCODE);