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/dto/request/menber/UserGrowthRecordDTO.java |   13 +++++++++++++
 1 files changed, 13 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..4281ed3 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,18 @@
     @ApiModelProperty("当前成长值")
     private int currentGrowthValue;
 
+    @ApiModelProperty("折扣类型")
+    private String currentDiscountType;
+
+    @ApiModelProperty("折扣类型Str")
+    private String currentDiscountTypeStr;
+
+    @ApiModelProperty("当前会员等级优惠金额")
+    private BigDecimal currentDiscountAmount;
+
+    @ApiModelProperty("会员折扣百分比")
+    private BigDecimal currentDiscountRatio;
+
     List<TargetMemberDTO> targetMemberInfos;
 
 }

--
Gitblit v1.9.3