thingsboard-memoizeit

diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewDao.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewDao.java
index 781cb3a..25404db 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewDao.java
@@ -56,7 +56,7 @@ public interface EntityViewDao extends Dao<EntityView> {
      * @return the list of entity view objects
      */
     List<EntityView> findEntityViewByTenantIdAndEntityId(UUID tenantId,
-                                                         EntityId entityId,
+                                                         UUID entityId,
                                                          TextPageLink pageLink);
 
     /**
@@ -82,7 +82,7 @@ public interface EntityViewDao extends Dao<EntityView> {
      */
     List<EntityView> findEntityViewsByTenantIdAndCustomerIdAndEntityId(UUID tenantId,
                                                                        UUID customerId,
-                                                                       EntityId entityId,
+                                                                       UUID entityId,
                                                                        TextPageLink pageLink);
 
 }

diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
index e44cea5..4a42577 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
@@ -135,7 +135,7 @@ public class EntityViewServiceImpl extends AbstractEntityService
         validateString(entityId.toString(), "Incorrect entityId " + entityId.toString());
         validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink);
         List<EntityView> entityViews = entityViewDao.findEntityViewByTenantIdAndEntityId(tenantId.getId(),
-                entityId, pageLink);
+                entityId.getId(), pageLink);
 
         return new TextPageData<>(entityViews, pageLink);
     }
@@ -177,7 +177,7 @@ public class EntityViewServiceImpl extends AbstractEntityService
         validateString(entityId.toString(), "Incorrect entityId " + entityId.toString());
         validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink);
         List<EntityView> entityViews = entityViewDao.findEntityViewsByTenantIdAndCustomerIdAndEntityId(
-                tenantId.getId(), customerId.getId(), entityId, pageLink);
+                tenantId.getId(), customerId.getId(), entityId.getId(), pageLink);
 
         return new TextPageData<>(entityViews, pageLink);
     }