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

huliguo

4 天以前 b646898adf3f2ad119dd9fd1c7c01d7f0742bf97

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderVo.java

@@ -38,4 +38,10 @@
    @ApiModelProperty(value = "订单商品列表")
    List<AppSureOrderGoodsVo> appSureOrderGoodsVoList;

    @ApiModelProperty(value = "是否可抽奖（0=否，1=是）")
    private Boolean lotteryDraw;

    @ApiModelProperty(value = "抽奖活动id")
    private String lotteryEventId;

}