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

admin

2019-09-27 6b75391e97aa770e12965ec6e542856df79e6de0

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

      }