From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/dto/MgtMemberLevelDTO.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/dto/MgtMemberLevelDTO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/dto/MgtMemberLevelDTO.java
index beef6db..3f13a83 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/dto/MgtMemberLevelDTO.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/dto/MgtMemberLevelDTO.java
@@ -2,23 +2,19 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import javax.validation.constraints.NotNull;
+import java.util.List;
+import javax.validation.Valid;
import lombok.Data;
+/**
+ * @author mitao
+ * @date 2024/6/12
+ */
@Data
-@ApiModel("会员等级数据传输对象对象")
-public class MgtMemberLevelDTO implements Serializable {
+@ApiModel("会员等级数据传输对象")
+public class MgtMemberLevelDTO {
- private static final long serialVersionUID = 841295965476674650L;
-
- @ApiModelProperty(value = "会员等级")
- @NotNull(message = "会员等级不能为空")
- private Integer level;
-
- @ApiModelProperty(value = "累计消费")
- @NotNull(message = "累计消费不能为空")
- private BigDecimal cumulativeConsumption;
-
+ @ApiModelProperty("会员等级列表")
+ @Valid
+ List<MgtMemberLevelDetailDTO> memberLevelDTOList;
}
--
Gitblit v1.7.1