Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-16 8e631ceb2c08e6cd00e68b1aa9ad1fec7cea6a72

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

@@ -140,4 +140,13 @@
    * @throws UserTaoLiJinOriginException

    */

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



   /**

    * 领取淘礼金-好友赠送

    * @param uid

    * @param money

    * @return

    * @throws UserTaoLiJinOriginException

    */

   public UserTaoLiJinOrigin receiveFriendsGive(Long uid, BigDecimal money) throws UserTaoLiJinOriginException;

}