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

peng

3 天以前 211b5a717de92b9b52879280ca2285cdd0b4a54b

 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);
    }