Merge remote-tracking branch 'origin/user_action' into user_action

zxl

2 天以前 d33b041f4b2a63a22682c9b3f344ef35f84b4542

 framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java

@@ -82,6 +82,9 @@
    @ApiModelProperty(value = "有效期")
    private Integer effectiveDays;

    @ApiModelProperty(value = "商品使用限制")
    private Integer goodsUseLimitNum;

    public Coupon(CouponVO couponVO) {
        BeanUtils.copyProperties(couponVO, this);
    }