Merge remote-tracking branch 'origin/master'

admin

2019-03-13 f1fdf1aec9fb9f8f4d1220d4c8b3489b648ab59b

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

@@ -106,4 +106,14 @@
    */

   public void inviteOrderWeiQuan(Long uid, String orderId, BigDecimal money, BigDecimal balance);



   /**

    * 奖励订单到账

    * 
    * @param uid

    * @param orderId

    * @param money

    * @param balance

    */

   public void orderReward(Long uid, String orderId, BigDecimal money, BigDecimal balance);



}