From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/TaoBaoShopHistoryMapper.java | 142 +++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/TaoBaoShopHistoryMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/TaoBaoShopHistoryMapper.java
index 832cd66..5c35432 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/TaoBaoShopHistoryMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/TaoBaoShopHistoryMapper.java
@@ -1,72 +1,72 @@
-package com.yeshi.fanli.dao.mybatis.brand;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.brand.TaoBaoShopHistory;
-
-public interface TaoBaoShopHistoryMapper extends BaseMapper<TaoBaoShopHistory> {
-
-
- /**
- * 鏍规嵁鐢ㄦ埛id鍒犻櫎
- * @param uid
- * @return
- */
- void updateByUid(@Param("shopId") Long shopId, @Param("uid") Long uid);
-
- /**
- * 鏍规嵁鍒犻櫎
- * @param sid
- * @param device
- * @return
- */
- void updateByDevice(@Param("shopId") Long shopId, @Param("device") String device);
-
-
-
- /**
- * 鏍规嵁鐢ㄦ埛id鏌ヨ
- * @param uid
- * @return
- */
- TaoBaoShopHistory getByUid(@Param("shopId") Long shopId, @Param("uid") Long uid);
-
- /**
- * 鏍规嵁璁惧
- * @param sid
- * @param device
- * @return
- */
- TaoBaoShopHistory getByDevice(@Param("shopId") Long shopId, @Param("device") String device);
-
-
-
- /**
- * 鏍规嵁鐢ㄦ埛id鏌ヨ
- * @param uid
- * @return
- */
- List<TaoBaoShopHistory> listByUid(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid);
-
- long countByUid(@Param("uid") Long uid);
-
-
- /**
- * 鏍规嵁鐢ㄦ埛id鏌ヨ
- * @param uid
- * @return
- */
- List<TaoBaoShopHistory> listByDevice(@Param("start") long start, @Param("count") int count, @Param("device") String device);
-
- long countByDevice(@Param("device") String device);
-
- /**
- * 缁熻搴楅摵鐐瑰嚮鏁伴噺
- * @param shopId
- * @return
- */
- long countByShopId(@Param("shopId") Long shopId);
+package com.yeshi.fanli.dao.mybatis.brand;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.brand.TaoBaoShopHistory;
+
+public interface TaoBaoShopHistoryMapper extends BaseMapper<TaoBaoShopHistory> {
+
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id鍒犻櫎
+ * @param uid
+ * @return
+ */
+ void updateByUid(@Param("shopId") Long shopId, @Param("uid") Long uid);
+
+ /**
+ * 鏍规嵁鍒犻櫎
+ * @param sid
+ * @param device
+ * @return
+ */
+ void updateByDevice(@Param("shopId") Long shopId, @Param("device") String device);
+
+
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id鏌ヨ
+ * @param uid
+ * @return
+ */
+ TaoBaoShopHistory getByUid(@Param("shopId") Long shopId, @Param("uid") Long uid);
+
+ /**
+ * 鏍规嵁璁惧
+ * @param sid
+ * @param device
+ * @return
+ */
+ TaoBaoShopHistory getByDevice(@Param("shopId") Long shopId, @Param("device") String device);
+
+
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id鏌ヨ
+ * @param uid
+ * @return
+ */
+ List<TaoBaoShopHistory> listByUid(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid);
+
+ long countByUid(@Param("uid") Long uid);
+
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id鏌ヨ
+ * @param uid
+ * @return
+ */
+ List<TaoBaoShopHistory> listByDevice(@Param("start") long start, @Param("count") int count, @Param("device") String device);
+
+ long countByDevice(@Param("device") String device);
+
+ /**
+ * 缁熻搴楅摵鐐瑰嚮鏁伴噺
+ * @param shopId
+ * @return
+ */
+ long countByShopId(@Param("shopId") Long shopId);
}
\ No newline at end of file
--
Gitblit v1.8.0