Merge remote-tracking branch 'origin/div' into div

admin

2020-05-13 60a099a7edfd81a3b10c766e113c019cdef6cd3d

 fanli/src/main/java/com/yeshi/fanli/vo/money/MoneyPredictVO.java

@@ -13,7 +13,20 @@
   private BigDecimal teamMoney;// 累计提现

   private Integer teamNum;// 累计提现



   private String  countDate; // 统计日期

   private String countDate; // 统计日期

	
	
   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() {