From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoLinkServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoLinkServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoLinkServiceImpl.java
index 5bacdcf..c505655 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoLinkServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoLinkServiceImpl.java
@@ -11,7 +11,7 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.taobao.TaoBaoLinkDao;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;
@@ -21,7 +21,7 @@
@Resource
private TaoBaoLinkDao dao;
- public TaoBaoLink find(long auctionId, System system) {
+ public TaoBaoLink find(long auctionId, BusinessSystem system) {
List<TaoBaoLink> list = dao.list("from TaoBaoLink tbk where tbk.auctionId = ? and tbk.system.id = ? ", new Serializable[]{auctionId,system.getId()});
if(list.size() >0){
return list.get(0);
--
Gitblit v1.8.0