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

huliguo

昨天 a966dafb8877552267a94fe8c544c5ea72cf5650

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

@@ -31,7 +31,7 @@
    @ApiModelProperty(value = "奖品来源")
    private String giftFrom;

    @ApiModelProperty(value = "礼物类型1优惠券2商品3现金4实物")
    @ApiModelProperty(value = "礼物类型1优惠券2商品3现金4实物5积分")
    private Integer giftType;

    @ApiModelProperty(value = "奖品名称")