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/push/DeviceTokenHWMapper.java |   74 ++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceTokenHWMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceTokenHWMapper.java
index 5e6db3d..f35fd9b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceTokenHWMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceTokenHWMapper.java
@@ -1,38 +1,38 @@
-package com.yeshi.fanli.dao.mybatis.push;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.entity.push.DeviceTokenHW;
-
-public interface DeviceTokenHWMapper {
-
-	int deleteByPrimaryKey(Long id);
-
-	int insert(DeviceTokenHW record);
-
-	int insertSelective(DeviceTokenHW record);
-
-	DeviceTokenHW selectByPrimaryKey(Long id);
-
-	int updateByPrimaryKeySelective(DeviceTokenHW record);
-
-	int updateByPrimaryKey(DeviceTokenHW record);
-
-	List<DeviceTokenHW> selectByDeviceAndUid(@Param("device") String device, @Param("uid") Long uid);
-
-	List<DeviceTokenHW> selectList(@Param("start") long start, @Param("count") int count,
-			@Param("versionList") List<Integer> versionList);
-
-	List<DeviceTokenHW> selectByUid(@Param("uid") Long uid, @Param("versionList") List<Integer> versionList);
-
-	Long selectCount(@Param("versionList") List<Integer> versionList);
-
-	List<DeviceTokenHW> selectByDevice(String device);
-	
-	List<DeviceTokenHW> selectByDeviceForUpdate(String device);
-
-	int bindUidByDevice(@Param("uid") Long uid, @Param("device") String device);
-
+package com.yeshi.fanli.dao.mybatis.push;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.entity.push.DeviceTokenHW;
+
+public interface DeviceTokenHWMapper {
+
+	int deleteByPrimaryKey(Long id);
+
+	int insert(DeviceTokenHW record);
+
+	int insertSelective(DeviceTokenHW record);
+
+	DeviceTokenHW selectByPrimaryKey(Long id);
+
+	int updateByPrimaryKeySelective(DeviceTokenHW record);
+
+	int updateByPrimaryKey(DeviceTokenHW record);
+
+	List<DeviceTokenHW> selectByDeviceAndUid(@Param("device") String device, @Param("uid") Long uid);
+
+	List<DeviceTokenHW> selectList(@Param("start") long start, @Param("count") int count,
+			@Param("versionList") List<Integer> versionList);
+
+	List<DeviceTokenHW> selectByUid(@Param("uid") Long uid, @Param("versionList") List<Integer> versionList);
+
+	Long selectCount(@Param("versionList") List<Integer> versionList);
+
+	List<DeviceTokenHW> selectByDevice(String device);
+	
+	List<DeviceTokenHW> selectByDeviceForUpdate(String device);
+
+	int bindUidByDevice(@Param("uid") Long uid, @Param("device") String device);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0