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

zxl

4 天以前 d33b041f4b2a63a22682c9b3f344ef35f84b4542

 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;