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

admin

2019-10-30 3f7c35dcb3bd703fcb952bb1a7d3ba5088d87b54

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java

@@ -265,7 +265,7 @@
         return;



      // 判断device是否存在

      DeviceTokenIOS deviceTokenIos = deviceTokenIOSMapper.selectByDevice(device);

      DeviceTokenIOS deviceTokenIos = deviceTokenIOSMapper.selectByDeviceForUpdate(device);

      if (deviceTokenIos == null) {

         deviceTokenIos = new DeviceTokenIOS();

         deviceTokenIos.setCreateTime(new Date());