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

yujian

2019-10-09 b44f60ae27bbe0b7aec29414c629747b7755e964

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

@@ -60,7 +60,7 @@
         }



         if (StringUtil.isNullOrEmpty(da.getMac()))

            updateDeviceActive.setImei(deviceActive.getMac());

            updateDeviceActive.setMac(deviceActive.getMac());



         deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);

      }