From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:31:12 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/entity/menber/Member.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 b79250e..29afe94 100644
--- a/src/main/java/com/mzl/flower/entity/menber/Member.java
+++ b/src/main/java/com/mzl/flower/entity/menber/Member.java
@@ -28,7 +28,7 @@
private int endPoint;
@ApiModelProperty("会员折扣类型（百分比、固定金额）")
- private int discountType;
+ private String discountType;
@ApiModelProperty("会员折扣百分比")
private BigDecimal discountRatio;
@@ -45,6 +45,13 @@
@ApiModelProperty("未消费产生的下降值")
private int downgradeValue;
- @ApiModelProperty("成长值规则")
- private String growthRule;
+ @ApiModelProperty("背景")
+ private String background;
+
+ @ApiModelProperty("图片")
+ private String pictures;
+
+ @ApiModelProperty(value = "会员成长值获取规则")
+ private String growthValueDesc;
+
}
--
Gitblit v1.9.3