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/dto/request/menber/MemberDTO.java |   16 ++++++++++++++--
 1 files changed, 14 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 c1c6724..8bad763 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
@@ -20,8 +20,7 @@
     private int startPoint;
 
     @ApiModelProperty("成长点-区间-结束")
-    @NotNull
-    private int endPoint;
+    private Integer endPoint;
 
     @ApiModelProperty("会员折扣类型(百分比、固定金额)")
     @NotNull
@@ -47,4 +46,17 @@
     @NotNull
     private int downgradeValue;
 
+
+    @ApiModelProperty("背景")
+    @NotNull
+    private String background;
+
+    @ApiModelProperty("图片")
+    @NotNull
+    private String pictures;
+
+    @ApiModelProperty(value = "会员成长值获取规则")
+    @NotNull
+    private String growthValueDesc;
+
 }

--
Gitblit v1.9.3