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

peng

8 天以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

 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;