From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/vo/money/MoneyPredictVO.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/money/MoneyPredictVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/money/MoneyPredictVO.java
index be9c0ce..0220681 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/money/MoneyPredictVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/money/MoneyPredictVO.java
@@ -3,6 +3,7 @@
import java.math.BigDecimal;
public class MoneyPredictVO {
+ private String countDate; // 缁熻鏃ユ湡
// 鎬荤殑
private BigDecimal totalMoney; // 鎬婚浼版敹鐩�
private Integer totalNum; // 鎬讳粯娆捐鍗曟暟锛堢瑪锛�
@@ -10,24 +11,19 @@
private BigDecimal mineMoney;// 棰勪及鎴戠殑鏀剁泭
private Integer mineNum;// 浠樻璁㈠崟鏁帮紙绗旓級
// 鍥㈤槦
- private BigDecimal teamMoney;// 绱鎻愮幇
- private Integer teamNum;// 绱鎻愮幇
+ private BigDecimal teamMoney;// 绱濂栭噾
+ private Integer teamNum;// 绱璁㈠崟
- private String countDate; // 缁熻鏃ユ湡
-
-
- public MoneyPredictVO() {}
-
-
- public MoneyPredictVO(BigDecimal mineMoney, Integer mineNum, BigDecimal teamMoney,Integer teamNum) {
+ public MoneyPredictVO() {
+ }
+
+ public MoneyPredictVO(BigDecimal mineMoney, Integer mineNum, BigDecimal teamMoney, Integer teamNum) {
this.mineMoney = mineMoney;
this.mineNum = mineNum;
this.teamMoney = teamMoney;
this.teamNum = teamNum;
}
-
-
-
+
public BigDecimal getTotalMoney() {
return totalMoney;
--
Gitblit v1.8.0