From b646898adf3f2ad119dd9fd1c7c01d7f0742bf97 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 31 七月 2025 11:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java
index fea8f44..d92272e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java
@@ -16,6 +16,15 @@
@Data
public class MerVerifyAwardVo {
+ @ApiModelProperty(value = "核销状态1.未核销2.已核销")
+ private Integer verifyStatus;
+
+ @ApiModelProperty(value = "奖品id")
+ private String prizeId;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
@ApiModelProperty(value = "用户姓名")
private String userName;
@@ -25,7 +34,7 @@
@ApiModelProperty(value = "奖品来源")
private String giftFrom;
- @ApiModelProperty(value = "礼物类型1优惠券2商品3现金4实物")
+ @ApiModelProperty(value = "礼物类型1优惠券2商品3现金4实物5积分")
private Integer giftType;
@ApiModelProperty(value = "奖品名称")
--
Gitblit v1.7.1