From 59aced4fe04f7e2fdcca81cb9ef279a70522301e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 十二月 2019 12:30:44 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dto/ConfigParamsDTO.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/ConfigParamsDTO.java b/fanli/src/main/java/com/yeshi/fanli/dto/ConfigParamsDTO.java
index 67d20f6..8d148dd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/ConfigParamsDTO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/ConfigParamsDTO.java
@@ -8,7 +8,8 @@
// 鍒嗕韩姣斾緥
private BigDecimal shareRate;
// 濂栧姳鍒告渶楂樿繑姣斾緥
-// private BigDecimal maxRewardRate;
+ private BigDecimal maxRewardRate;
+
// VIP杩斿埄姣斾緥
private BigDecimal vipFanLiRate;// 浼氬憳杩斿埄姣斾緥
@@ -27,7 +28,7 @@
public ConfigParamsDTO(BigDecimal fanLiRate, BigDecimal shareRate, BigDecimal maxRewardRate, BigDecimal vipRate) {
this.fanLiRate = fanLiRate;
this.shareRate = shareRate;
-// this.maxRewardRate = maxRewardRate;
+ this.maxRewardRate = maxRewardRate;
this.vipFanLiRate = vipRate;
}
@@ -47,12 +48,12 @@
this.shareRate = shareRate;
}
-// public BigDecimal getMaxRewardRate() {
-// return maxRewardRate;
-// }
-//
-// public void setMaxRewardRate(BigDecimal maxRewardRate) {
-// this.maxRewardRate = maxRewardRate;
-// }
+ public BigDecimal getMaxRewardRate() {
+ return maxRewardRate;
+ }
+
+ public void setMaxRewardRate(BigDecimal maxRewardRate) {
+ this.maxRewardRate = maxRewardRate;
+ }
}
--
Gitblit v1.8.0