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/MerVerifyAwardVo.java

@@ -22,6 +22,9 @@
    @ApiModelProperty(value = "奖品id")
    private String prizeId;

    @ApiModelProperty(value = "用户id")
    private Long userId;

    @ApiModelProperty(value = "用户姓名")
    private String userName;