Merge remote-tracking branch 'origin/master'

admin

2019-03-15 3cf41feae65a864fc00d72fdd09a676372fc3b27

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceTokenIOSMapper.java

@@ -22,7 +22,7 @@
   
   List<DeviceTokenIOS> selectByUid( @Param("uid")Long uid,  @Param("list")List<Integer> list);
   
   List<DeviceTokenIOS> selectList(@Param("start")Long start,@Param("count")int count, @Param("array")String[] arrayVersion);
   List<DeviceTokenIOS> selectList(@Param("start")Long start,@Param("count")int count, @Param("list")List<Integer> list);
   
   long selectCount();