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/entity/menber/Member.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/menber/Member.java b/src/main/java/com/mzl/flower/entity/menber/Member.java
index 04edbf2..b23f218 100644
--- a/src/main/java/com/mzl/flower/entity/menber/Member.java
+++ b/src/main/java/com/mzl/flower/entity/menber/Member.java
@@ -1,10 +1,12 @@
package com.mzl.flower.entity.menber;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.mzl.flower.base.BaseAutoEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
@@ -19,16 +21,16 @@
public class Member extends BaseAutoEntity {
@ApiModelProperty("会员等级名称")
- private String levelName;
+ private String name;
- @ApiModelProperty("该等级所需的最低成长值")
- private int minGrowthValue;
+ @ApiModelProperty("成长点-区间-开始")
+ private int startPoint;
- @ApiModelProperty("该等级所需的最高成长值")
- private int maxGrowthValue;
+ @ApiModelProperty("成长点-区间-结束")
+ private int endPoint;
@ApiModelProperty("会员折扣类型（百分比、固定金额）")
- private int discountType;
+ private String discountType;
@ApiModelProperty("会员折扣百分比")
private BigDecimal discountRatio;
@@ -40,8 +42,14 @@
private int consumptionAmount;
@ApiModelProperty("已消费产生的成长值")
- private int upGrowthValue;
+ private int growthValue;
@ApiModelProperty("未消费产生的下降值")
- private int downGrowthValue;
+ private int downgradeValue;
+
+ @ApiModelProperty("背景")
+ private String background;
+
+ @ApiModelProperty("图片")
+ private String pictures;
}
--
Gitblit v1.9.3