From 37e8ba46879a6094938ad685b1054eb6446ae749 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 23 五月 2020 19:13:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java index 50a4784..8be1199 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java @@ -39,7 +39,8 @@ * @param pageSize * @return */ - public List<ScanHistoryV2> getScanHistoryByDeviceOrUid(Long uid, String device, int page, int pageSize, Integer source); + public List<ScanHistoryV2> getScanHistoryByDeviceOrUid(Long uid, String device, int page, int pageSize, + Integer source, boolean notBackSuVip); /** * 鏍规嵁璁惧鎴栬�呯敤鎴稩D鑾峰彇娴忚璁板綍鏁伴噺 @@ -48,7 +49,7 @@ * @param device * @return */ - public long getCountByDeviceOrUid(Long uid, String device, Integer source); + public long getCountByDeviceOrUid(Long uid, String device, Integer source, boolean notBackSuVip); /** * 鏍规嵁鐢ㄦ埛鎴栬�呰澶囧垹闄ゆ祻瑙堣褰� -- Gitblit v1.8.0