From 70e22f5f9c51a24452a877489a49c2d800b399eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 18:12:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/ScanHistoryV2Mapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/ScanHistoryV2Mapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/ScanHistoryV2Mapper.java
index b2ab7b7..2b33e27 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/ScanHistoryV2Mapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/ScanHistoryV2Mapper.java
@@ -19,7 +19,8 @@
* @return
*/
List<ScanHistoryV2> selectByDeviceOrUid(@Param("uid") Long uid, @Param("device") String device,
- @Param("start") long start, @Param("count") int count, @Param("source")Integer source);
+ @Param("start") long start, @Param("count") int count, @Param("source")Integer source,
+ @Param("notBackSuVip")boolean notBackSuVip);
/**
* 鏍规嵁UID鎴栬�呰澶囧彿鑾峰彇娴忚璁板綍鏉℃暟
@@ -28,7 +29,8 @@
* @param device
* @return
*/
- Long selectCountByDeviceOrUid(@Param("uid") Long uid, @Param("device") String device, @Param("source")Integer source);
+ Long selectCountByDeviceOrUid(@Param("uid") Long uid, @Param("device") String device,
+ @Param("source")Integer source, @Param("notBackSuVip")boolean notBackSuVip);
/**
* 鏍规嵁璁惧鎴栫敤鎴稩D鍒犻櫎
--
Gitblit v1.8.0