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-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CouponMember.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CouponMember.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CouponMember.java
index e6493e0..27fbb47 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CouponMember.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CouponMember.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.enums.CouponTypeEnum;
+import com.ruoyi.common.core.enums.CouponUseEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -46,9 +47,9 @@
@ApiModelProperty(value = "优惠券类型 1=满减券 2=代金券 3=折扣券")
private CouponTypeEnum couponType;
- @ApiModelProperty(value = "优惠券状态-1删除0已过期1已领取2已使用")
- private Integer couponStatus;
-
+ @ApiModelProperty(value = "优惠券状态 0：未使用， 1：已使用 2：已过期")
+ private CouponUseEnum couponStatus;
+
@ApiModelProperty(value = "满减金额，例如：满100元")
private BigDecimal fullReductionAmount;
--
Gitblit v1.7.1