From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'
---
src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java b/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java
index 084fad1..bd069ad 100644
--- a/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java
@@ -1,8 +1,10 @@
package com.mzl.flower.dto.request.menber;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@Data
@@ -11,30 +13,47 @@
private Long id;
@ApiModelProperty("会员等级名称")
+ @NotNull
private String name;
@ApiModelProperty("成长点-区间-开始")
+ @NotNull
private int startPoint;
@ApiModelProperty("成长点-区间-结束")
- private int endPoint;
+ private Integer endPoint;
@ApiModelProperty("会员折扣类型（百分比、固定金额）")
- private int discountType;
+ @NotNull
+ private String discountType;
@ApiModelProperty("会员折扣百分比")
+ @NotNull
private BigDecimal discountRatio;
@ApiModelProperty("会员折扣固定金额")
+ @NotNull
private BigDecimal discountAmount;
@ApiModelProperty("消费金额（元）")
+ @NotNull
private int consumptionAmount;
@ApiModelProperty("已消费产生的成长值")
+ @NotNull
private int growthValue;
@ApiModelProperty("未消费产生的下降值")
+ @NotNull
private int downgradeValue;
+
+ @ApiModelProperty("背景")
+ @NotNull
+ private String background;
+
+ @ApiModelProperty("图片")
+ @NotNull
+ private String pictures;
+
}
--
Gitblit v1.9.3