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

peng

1 天以前 6d95ff17f7d0de0b3efafe033ba1e3b4487d4f2e

 framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java

@@ -28,6 +28,10 @@
    private static final long serialVersionUID = 8372420376262437018L;

    /**
     * 是否拥有优惠卷
     */
    private Boolean owned;
    /**
     * 促销关联的商品
     */
    @ApiModelProperty(value = "优惠券关联商品集合")