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

peng

6 天以前 f931144c06ce670ee0eb7384ea05cde4c4497dd3

 framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java

@@ -85,6 +85,12 @@
    @ApiModelProperty(value = "促销id")
    private String promotionId;

    @ApiModelProperty(value = "优惠卷id")
    private String couponId;

    @ApiModelProperty(value = "优惠卷名称")
    private String couponName;

    @ApiModelProperty(value = "销售金额")
    private Double goodsPrice;