From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +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 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 6d7de0f..29afe94 100644
--- a/src/main/java/com/mzl/flower/entity/menber/Member.java
+++ b/src/main/java/com/mzl/flower/entity/menber/Member.java
@@ -5,7 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
@@ -45,4 +44,14 @@
 
     @ApiModelProperty("未消费产生的下降值")
     private int downgradeValue;
+
+    @ApiModelProperty("背景")
+    private String background;
+
+    @ApiModelProperty("图片")
+    private String pictures;
+
+    @ApiModelProperty(value = "会员成长值获取规则")
+    private String growthValueDesc;
+
 }

--
Gitblit v1.9.3