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/inter/user/ScanHistoryService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ScanHistoryService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ScanHistoryService.java
index 3e1fe8d..c00178a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ScanHistoryService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ScanHistoryService.java
@@ -5,7 +5,7 @@
 import java.util.Map;
 
 import com.yeshi.fanli.entity.admin.ScanHistoryAdmin;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
 import com.yeshi.fanli.entity.taobao.ScanHistory;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
 
@@ -34,9 +34,9 @@
 	public List<TaoBaoGoodsBriefExtra> getHotTaoBaoGoodsBriefExtras(String key,
 			int pageIndex);
 
-	public void deleteScanHistory(String device, System sys, long uid);
+	public void deleteScanHistory(String device, BusinessSystem sys, long uid);
 
-	public void deleteScanHistory(String device, System sys, long auctionId,
+	public void deleteScanHistory(String device, BusinessSystem sys, long auctionId,
 			long uid);
 
 }

--
Gitblit v1.8.0