Fix comparing entity versions: ignore tenantId and createdTime

common/data/src/main/java/org/thingsboard/server/common/data/sync/JsonTbEntity.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.common.data.sync;
 
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -49,5 +50,6 @@ import java.lang.annotation.Target;
         @Type(name = "ENTITY_VIEW", value = EntityView.class),
         @Type(name = "WIDGETS_BUNDLE", value = WidgetsBundle.class)
 })
+@JsonIgnoreProperties(value = {"tenantId", "createdTime"}, ignoreUnknown = true)
 public @interface JsonTbEntity {
 }

common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java

@@ -55,7 +55,6 @@ public class EntityExportData<E extends ExportableEntity<? extends EntityId>> {
             .comparing(AttributeExportData::getKey).thenComparing(AttributeExportData::getLastUpdateTs);
 
     @JsonProperty(index = 2)
-    @JsonIgnoreProperties({"tenantId", "createdTime"})
     @JsonTbEntity
     private E entity;
     @JsonProperty(index = 1)