From 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期一, 02 九月 2024 20:18:52 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateVipDTO.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateVipDTO.java b/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateVipDTO.java
index 160c46d..a87686a 100644
--- a/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateVipDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateVipDTO.java
@@ -1,7 +1,6 @@
package com.mzl.flower.dto.request.coupon;
-import com.mzl.flower.base.annotation.DictTrans;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -56,14 +55,13 @@
* 会员等级
*/
@ApiModelProperty(value = "会员等级")
- @NotEmpty(message = "会员等级不能为空")
- private String vipGrade;
+ @NotNull(message = "会员等级不能为空")
+ private Integer memberId;
/**
* 领取后有效类型（COUPON_usage_time_type）天、小时、分钟
*/
@ApiModelProperty(value = "领取后有效类型（COUPON_USAGE_TIME_TYPE）")
- @DictTrans(target = "usageTimeTypeName",codeType = "COUPON_USAGE_TIME_TYPE")
private String usageTimeType;
/**
@@ -72,7 +70,5 @@
@ApiModelProperty(value = "领取后有效时间整数")
private Integer usageTimeNum;
- @ApiModelProperty(value = "领取后有效类型名称")
- private String usageTimeTypeName;
}
--
Gitblit v1.9.3