Merge remote-tracking branch 'origin/master'

admin

2019-03-01 bb688ff2b4b42bc440a8e7145f53e9030073fa6a

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

@@ -18,6 +18,8 @@

   DeviceTokenIOS selectByDevice(String device);
   
   DeviceTokenIOS selectByDeviceToken(String deviceToken);
	
   List<DeviceTokenIOS> selectByUid(Long uid);
   
   List<DeviceTokenIOS> selectList(@Param("start")Long start,@Param("count")int count);