Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -316,8 +316,7 @@
   private void refreshDeviceInRedis(String mac){

        if(!StringUtils.isBlank(mac)){

            Device device = deviceMapper.selectWithOrgIdsByMac(mac);

             String key = "device_"+mac;

          setDeviceToRedis(key,device);

          setDeviceToRedis(mac,device);

         }else

       {

          log.warn("param mac is null in method [refreshDeviceInRedis]");