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

admin

2019-11-25 e65037e672ecab852e2a6c5b242cdadfd1a58b33

 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java

@@ -184,7 +184,7 @@


   public long countAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime);



   /**

   /**
    * 查询来源该下级成功分享 + 自购订单 

    * @param uid

    * @param teamUid

@@ -199,6 +199,6 @@
    * @param teamUid 下级id

    * @return

    */

   public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid);

   public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid);


}