Merge remote-tracking branch 'origin/div' into div

admin

2019-08-02 90b211c63f9d596aa90b508f76eb916a30b68731

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

@@ -18,17 +18,16 @@

   DeviceTokenIOS selectByDevice(String device);
   
   List<DeviceTokenIOS> selectByUid(Long uid);
   DeviceTokenIOS selectByDeviceToken(String deviceToken);
   
   List<DeviceTokenIOS> selectList(@Param("start")Long start,@Param("count")int count);
   List<DeviceTokenIOS> selectByUid( @Param("uid")Long uid,  @Param("list")List<Integer> list);
	
   List<DeviceTokenIOS> selectList(@Param("start")Long start,@Param("count")int count, @Param("list")List<Integer> list);
   
   long selectCount();
   
   int updateByPrimaryKeySelective(DeviceTokenIOS record);

   int updateByPrimaryKey(DeviceTokenIOS record);
	
	
	
   
}