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/domain/Coupon.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/Coupon.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/Coupon.java
index 2a13280..a8b87e5 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/Coupon.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/Coupon.java
@@ -7,6 +7,8 @@
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.DistributionMethodEnum;
+import com.ruoyi.common.core.enums.ListingStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -43,7 +45,7 @@
private CouponTypeEnum couponType;
@ApiModelProperty(value = "状态 0=已上架 1=已下架")
- private Integer couponStatus;
+ private ListingStatusEnum couponStatus;
@ApiModelProperty(value = "满减金额，例如：满100元")
private BigDecimal fullReductionAmount;
@@ -69,6 +71,9 @@
@ApiModelProperty(value = "有效期止")
private LocalDateTime endDate;
+ @ApiModelProperty(value = "发放方式 1=全部会员 2=指定会员等级 3=指定会员")
+ private DistributionMethodEnum distributionMethod;
+
@ApiModelProperty(value = "会员等级，多等级以 , 隔开")
private String memberLevel;
--
Gitblit v1.7.1