From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/ScanHistoryV2Mapper.java | 124 ++++++++++++++++++++--------------------
1 files changed, 62 insertions(+), 62 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 074fce1..b2ab7b7 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
@@ -1,63 +1,63 @@
-package com.yeshi.fanli.dao.mybatis.goods;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.goods.ScanHistoryV2;
-
-public interface ScanHistoryV2Mapper extends BaseMapper<ScanHistoryV2> {
-
- /**
- * 鏍规嵁UID鎴栬�呰澶囧彿鑾峰彇娴忚璁板綍
- *
- * @param uid
- * @param device
- * @param start
- * @param count
- * @return
- */
- List<ScanHistoryV2> selectByDeviceOrUid(@Param("uid") Long uid, @Param("device") String device,
- @Param("start") long start, @Param("count") int count, @Param("source")Integer source);
-
- /**
- * 鏍规嵁UID鎴栬�呰澶囧彿鑾峰彇娴忚璁板綍鏉℃暟
- *
- * @param uid
- * @param device
- * @return
- */
- Long selectCountByDeviceOrUid(@Param("uid") Long uid, @Param("device") String device, @Param("source")Integer source);
-
- /**
- * 鏍规嵁璁惧鎴栫敤鎴稩D鍒犻櫎
- *
- * @param uid
- * @param device
- * @return
- */
- List<ScanHistoryV2> listDeviceOrUid(@Param("uid") Long uid, @Param("device") String device);
-
- /**
- * 鏍规嵁璁惧鎴栫敤鎴稩D涓庡晢鍝佷俊鎭绱�
- *
- * @param uid
- * @param device
- * @param goodsId
- * @param goodsType
- * @return
- */
- List<ScanHistoryV2> selectByDeviceOrUidAndGoodsIdAndGoodsType(@Param("uid") Long uid,
- @Param("device") String device, @Param("goodsId") long goodsId);
-
-
- /**
- * 鏍规嵁绠�鐗堝晢鍝乮d鏌ヨ
- * @param uid
- * @param device
- * @param commonId
- * @return
- */
- List<ScanHistoryV2> getByCommonGoodsId(@Param("uid") Long uid, @Param("device") String device, @Param("commonId")Long commonId);
+package com.yeshi.fanli.dao.mybatis.goods;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.goods.ScanHistoryV2;
+
+public interface ScanHistoryV2Mapper extends BaseMapper<ScanHistoryV2> {
+
+ /**
+ * 鏍规嵁UID鎴栬�呰澶囧彿鑾峰彇娴忚璁板綍
+ *
+ * @param uid
+ * @param device
+ * @param start
+ * @param count
+ * @return
+ */
+ List<ScanHistoryV2> selectByDeviceOrUid(@Param("uid") Long uid, @Param("device") String device,
+ @Param("start") long start, @Param("count") int count, @Param("source")Integer source);
+
+ /**
+ * 鏍规嵁UID鎴栬�呰澶囧彿鑾峰彇娴忚璁板綍鏉℃暟
+ *
+ * @param uid
+ * @param device
+ * @return
+ */
+ Long selectCountByDeviceOrUid(@Param("uid") Long uid, @Param("device") String device, @Param("source")Integer source);
+
+ /**
+ * 鏍规嵁璁惧鎴栫敤鎴稩D鍒犻櫎
+ *
+ * @param uid
+ * @param device
+ * @return
+ */
+ List<ScanHistoryV2> listDeviceOrUid(@Param("uid") Long uid, @Param("device") String device);
+
+ /**
+ * 鏍规嵁璁惧鎴栫敤鎴稩D涓庡晢鍝佷俊鎭绱�
+ *
+ * @param uid
+ * @param device
+ * @param goodsId
+ * @param goodsType
+ * @return
+ */
+ List<ScanHistoryV2> selectByDeviceOrUidAndGoodsIdAndGoodsType(@Param("uid") Long uid,
+ @Param("device") String device, @Param("goodsId") long goodsId);
+
+
+ /**
+ * 鏍规嵁绠�鐗堝晢鍝乮d鏌ヨ
+ * @param uid
+ * @param device
+ * @param commonId
+ * @return
+ */
+ List<ScanHistoryV2> getByCommonGoodsId(@Param("uid") Long uid, @Param("device") String device, @Param("commonId")Long commonId);
}
\ No newline at end of file
--
Gitblit v1.8.0