From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceTokenHWMapper.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 0df875c..cfc2c41 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
@@ -23,10 +23,13 @@
List<DeviceTokenHW> selectByDeviceAndUid(@Param("device") String device, @Param("uid") Long uid);
List<DeviceTokenHW> selectList(@Param("start") long start, @Param("count") int count);
-
+
List<DeviceTokenHW> selectByUid(Long uid);
Long selectCount();
List<DeviceTokenHW> selectByDevice(String device);
+
+ int bindUidByDevice(@Param("uid") Long uid, @Param("device") String device);
+
}
\ No newline at end of file
--
Gitblit v1.8.0