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

admin

2019-11-13 221b5c8d0de3f6b17a00d543503a79c13b28ba12

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

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

   DeviceTokenIOS selectByDevice(String device);
   
   DeviceTokenIOS selectByDeviceForUpdate(String device);
	
   DeviceTokenIOS selectByDeviceToken(String deviceToken);
   
   List<DeviceTokenIOS> selectByUid( @Param("uid")Long uid,  @Param("list")List<Integer> list);