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

admin

2020-03-14 55b3bd7821f14db9e9441d8b34fb9bdc1a9e4df7

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

@@ -38,8 +38,10 @@
            deviceActive.getPlatform());

      if (da == null) {

         deviceActive.setId(null);

         deviceActive.setUpdateTime(new Date());

         deviceActive.setCreateTime(new Date());

         if (deviceActive.getUpdateTime() == null)

            deviceActive.setUpdateTime(new Date());

         if (deviceActive.getCreateTime() == null)

            deviceActive.setCreateTime(new Date());

         if (!StringUtil.isNullOrEmpty(deviceActive.getDeviceToken())) {

            deviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));

         }