Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -273,7 +273,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                 info.get(l).setAlarmTime1(hours+":"+minutes+":"+seconds);
             }
             for(int m=0;m<deviceTypeList.size();m++){
-                if(info.get(l).getDeviceType().equals(deviceTypeList.get(m).getTypeCode())){
+                if(info.get(l).getDeviceType().equals(Integer.parseInt(deviceTypeList.get(m).getTypeCode()))){
                     info.get(l).setDeviceTypeName(deviceTypeList.get(m).getTypeName());
                 }
             }