From c71055635df3d75e5dc838a9b66036c591913a13 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期六, 08 七月 2023 18:37:12 +0800 Subject: [PATCH] 管理台bug和用户端 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 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..fea8f44 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,29 @@ */ @Data public class MerVerifyAwardVo { + + @ApiModelProperty(value = "用户姓名") + private String userName; + + @ApiModelProperty(value = "用户电话") + private String userMobile; + + @ApiModelProperty(value = "奖品来源") + private String giftFrom; + + @ApiModelProperty(value = "礼物类型1优惠券2商品3现金4实物") + 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