Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-13 0efda3a0ac631642dfe879487d7b93415363bbd4

 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);



}