Merge branch 'usky-zyj' into server-165

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

@@ -1147,7 +1147,7 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
                 devList.get(i).setCreatedTime(LocalDateTime.now());
                 devList.get(i).setTenantId(list.get(0).getTenantId());
                 devList.get(i).setServiceStatus(1);
-                devList.get(i).setDeviceUuid(UUIDUtils.uuid());
+                devList.get(i).setDeviceUuid(UUIDUtils.uuid().substring(0, 16));
 
                 DmpDeviceStatus dmpDeviceStatus = new DmpDeviceStatus();
                 dmpDeviceStatus.setDeviceId(devList.get(i).getDeviceId());