From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceTokenIOSMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceTokenIOSMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceTokenIOSMapper.java
index ab1e0d1..262127e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceTokenIOSMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceTokenIOSMapper.java
@@ -20,9 +20,9 @@
DeviceTokenIOS selectByDeviceToken(String deviceToken);
- List<DeviceTokenIOS> selectByUid(Long uid);
+ List<DeviceTokenIOS> selectByUid( @Param("uid")Long uid, @Param("list")List<Integer> list);
- List<DeviceTokenIOS> selectList(@Param("start")Long start,@Param("count")int count);
+ List<DeviceTokenIOS> selectList(@Param("start")Long start,@Param("count")int count, @Param("array")String[] arrayVersion);
long selectCount();
--
Gitblit v1.8.0