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-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java

@@ -406,6 +406,7 @@ public class CartHandlers {
 		}
 		bean.setText(openId);
 		bean.setPaperData(pageNO, pageSize);
+		System.out.println(bean.getMinNum() + "-->" + bean.getMaxNum());
 		List<ShopOrderAndItemDto> shopOrderList = cartService.selectShopOrder(bean);
 		ShopSystemRule shopSystemRule = this.adminOrderService.getReluByRid(109);