From 022c492fe0645af7761889f6471e3e2ae5751fb6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 26 五月 2020 15:27:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/vo/money/TeamPredictVO.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/money/TeamPredictVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/money/TeamPredictVO.java
index bdcae70..a4134d3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/money/TeamPredictVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/money/TeamPredictVO.java
@@ -14,13 +14,16 @@
 	private BigDecimal subsidy; // 鍥㈤槦琛ヨ创 X 100
 	private Integer subsidyNum; // 鍥㈤槦琛ヨ创璁㈠崟鏁伴噺
 
-	public TeamPredictVO() {}
-	
-	public TeamPredictVO(BigDecimal reward, Integer rewardNum, BigDecimal subsidy, Integer subsidyNum) {
+	public TeamPredictVO() {
+	}
+
+	public TeamPredictVO(BigDecimal reward, Integer rewardNum, BigDecimal subsidy, Integer subsidyNum,
+			Integer totalNum) {
 		this.reward = reward;
 		this.rewardNum = rewardNum;
 		this.subsidy = subsidy;
 		this.subsidyNum = subsidyNum;
+		this.totalNum = totalNum;
 	}
 
 	public String getCountDate() {

--
Gitblit v1.8.0