From 617cac9aab814b33a4a0947d7222eae1098028ca Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 28 十月 2024 16:33:52 +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/UserGrowthRecordDTO.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/request/menber/UserGrowthRecordDTO.java b/src/main/java/com/mzl/flower/dto/request/menber/UserGrowthRecordDTO.java
index 53b7acf..dd26e4a 100644
--- a/src/main/java/com/mzl/flower/dto/request/menber/UserGrowthRecordDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/menber/UserGrowthRecordDTO.java
@@ -3,6 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -13,6 +14,21 @@
     @ApiModelProperty("当前成长值")
     private int currentGrowthValue;
 
+    @ApiModelProperty("折扣类型")
+    private String currentDiscountType;
+
+    @ApiModelProperty("折扣类型Str")
+    private String currentDiscountTypeStr;
+
+    @ApiModelProperty("当前会员等级优惠金额")
+    private BigDecimal currentDiscountAmount;
+
+    @ApiModelProperty("会员折扣百分比")
+    private BigDecimal currentDiscountRatio;
+
+    @ApiModelProperty("会员成长值获取规则")
+    private String currentGrowthValueDesc;
+
     List<TargetMemberDTO> targetMemberInfos;
 
 }

--
Gitblit v1.9.3