Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-04 148af6b2f57be264c84d0991237fbd7ddea491a4

 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);