Merge branch 'master' into div

yujian

2019-07-16 a503900f405a39f3aa30a8663ca661cf3c6b55ea

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

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

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



   /**

    * 系统补齐

    * 
    * @param uid

    * @param reason

    * @param money

    * @param balance

    */

   public void systemEqualize(Long uid, String reason, BigDecimal money, BigDecimal balance);



}