Merge remote-tracking branch 'origin/div' into div

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/UserTLJBuyHistoryServiceImpl.java

@@ -13,6 +13,7 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;





@Service

public class UserTLJBuyHistoryServiceImpl implements UserTLJBuyHistoryService {

   @Resource