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/user/ScanHistoryServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java
index 4886fc7..6242209 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java
@@ -22,7 +22,7 @@
import com.yeshi.fanli.dao.user.ScanHistoryDao;
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.PidUser;
import com.yeshi.fanli.entity.taobao.ScanHistory;
import com.yeshi.fanli.entity.taobao.SearchFilter;
@@ -228,7 +228,7 @@
}
- public void deleteScanHistory(final String device, final System sys, final long uid) {
+ public void deleteScanHistory(final String device, final BusinessSystem sys, final long uid) {
scanHistoryDao.excute(new HibernateCallback() {
public Object doInHibernate(Session session) throws HibernateException {
@@ -251,7 +251,7 @@
});
}
- public void deleteScanHistory(final String device, final System sys, final long auctionId, final long uid) {
+ public void deleteScanHistory(final String device, final BusinessSystem sys, final long auctionId, final long uid) {
scanHistoryDao.excute(new HibernateCallback() {
public Object doInHibernate(Session session) throws HibernateException {
--
Gitblit v1.8.0