From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/CouponReceiveDetailVO.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/CouponReceiveDetailVO.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/CouponReceiveDetailVO.java
index 53bcf10..003056f 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/CouponReceiveDetailVO.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/CouponReceiveDetailVO.java
@@ -4,6 +4,7 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.CouponUseEnum;
+import com.ruoyi.promotion.converter.CouponUseEnumConverter;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -19,6 +20,9 @@
public class CouponReceiveDetailVO implements Serializable {
private static final long serialVersionUID = 7898162954825380293L;
+ @ApiModelProperty(value = "会员优惠券id")
+ @ExcelIgnore
+ private Long id;
@ApiModelProperty(value = "优惠券id")
@ExcelIgnore
@@ -43,10 +47,10 @@
@ApiModelProperty(value = "使用时间")
@ExcelProperty("使用时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createTime;
+ private LocalDateTime useTime;
@ApiModelProperty(value = "使用状态 0：未使用， 1：已使用")
- @ExcelProperty("使用状态")
+ @ExcelProperty(value = "使用状态", converter = CouponUseEnumConverter.class)
private CouponUseEnum couponStatus;
}
--
Gitblit v1.7.1