Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 0485fe81732a49c91a0c1e8628ad90ca72458e55

Merge remote-tracking branch 'origin/master'

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/UserTLJBuyHistoryService.java

 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/UserTLJBuyHistoryService.java

New file
@@ -0,0 +1,18 @@
package com.yeshi.fanli.service.inter.taobao;



import com.yeshi.fanli.entity.taobao.UserTLJBuyHistory;



/**

 * 淘礼金购买记录

 * 
 * @author Administrator

 *

 *

 */

public interface UserTLJBuyHistoryService {



    public boolean canBuy(Long uid, Long auctionId);



    public void addHistory(UserTLJBuyHistory history) throws Exception;



}