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

peng

1 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

 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;