From 3e0236dfc2cf6fca45c5e951a2cb0c722ba60b38 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:16:03 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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..ac68377 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,12 @@
@Data
public class MerVerifyAwardVo {
+ @ApiModelProperty(value = "核销状态1.未核销2.已核销")
+ private Integer verifyStatus;
+
+ @ApiModelProperty(value = "奖品id")
+ private String prizeId;
+
@ApiModelProperty(value = "用户姓名")
private String userName;
--
Gitblit v1.7.1