冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

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

@@ -76,8 +76,7 @@


      } else if ("ios".equalsIgnoreCase(platform)) {



         deviceActive = deviceActiveMapper.selectByDeviceToeknMd5AndPlatform(StringUtil.Md5(deviceToken),

               DeviceActive.PLATFORM_IOS);

         deviceActive = deviceActiveMapper.selectByDeviceAndPlatform(device, DeviceActive.PLATFORM_IOS);



      }