Merge branch 'mater-1.6.0' into div

admin

2019-08-15 eb78e9183005efa02064956cc9ef2299dc2d2bdd

 fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java

@@ -131,4 +131,13 @@
   public void addInviteWinMoneyByHand(Long uid, String inviteName, Date date)

         throws UserTaoLiJinOriginException;



	
   /**

    * 金币兑换

    * @param uid

    * @param money

    * @param userRank

    * @throws UserTaoLiJinOriginException

    */

   public void exchangeMoney(Long uid, BigDecimal money) throws UserTaoLiJinOriginException;

}