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

yujian

2019-10-14 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d

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