From 8059e9b991c15edbac508e6b658a0d9571d11b1c Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 01 八月 2025 12:46:00 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 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 db23148..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
@@ -1,6 +1,10 @@
package com.ruoyi.order.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
/**
* @author jqs34
@@ -11,4 +15,38 @@
*/
@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;
+
+ @ApiModelProperty(value = "用户电话")
+ private String userMobile;
+
+ @ApiModelProperty(value = "奖品来源")
+ private String giftFrom;
+
+ @ApiModelProperty(value = "礼物类型1优惠券2商品3现金4实物5积分")
+ private Integer giftType;
+
+ @ApiModelProperty(value = "奖品名称")
+ private String giftName;
+
+ @ApiModelProperty(value = "奖品数量")
+ private Double giftNumber;
+
+ @ApiModelProperty(value = "奖品备注")
+ private String giftRemark;
+
+ @ApiModelProperty(value = "获奖时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
}
--
Gitblit v1.7.1