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

yujian

2020-01-03 0a63d22e38a644bc83b393ed85618b04d3be858b

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

@@ -83,7 +83,7 @@
    * @return

    * @throws UserTaoLiJinRecordException

    */

   public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods)

   public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, BigDecimal couplePrice, TaoBaoGoodsBrief goods)

         throws UserTaoLiJinRecordException;



   /**