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

zxl

6 天以前 61e3917c5b0d667d23430890f45396a9bb7731ac

 framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java

@@ -32,6 +32,9 @@
    @ApiModelProperty(value = "图片")
    private String image;

    @ApiModelProperty(value = "图片")
    private String video;

    @ApiModelProperty(value = "商品名称")
    private String name;