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

admin

2020-04-15 3d92fcd729376c584a07d5f23b8e06f81fbcbcde

 fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java

@@ -148,10 +148,11 @@
    * 团队收益消息

    * @param uid

    * @param money 本次到账金额

    * @param subsidy 补贴金额

    * @param balance 余额

    * @param receivedDate  结算月度

    */

   public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate);

   public void teamReceive(Long uid, BigDecimal money,BigDecimal subsidy,  BigDecimal balance, Date receivedDate);



   /**

    * 使用奖励券