Dmytro Skarzhynets bee8f370b9
Merge branch 'master' into ai
# Conflicts:
#	application/src/main/data/upgrade/basic/schema_update.sql
#	application/src/main/java/org/thingsboard/server/controller/BaseController.java
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
#	application/src/main/java/org/thingsboard/server/service/security/permission/Resource.java
#	application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
#	common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
#	common/proto/src/main/proto/queue.proto
#	dao/pom.xml
#	dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
#	dao/src/main/resources/sql/schema-entities.sql
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/TenantIdLoader.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java
2025-06-23 20:31:59 +03:00
..
2025-06-03 18:55:18 +03:00
2025-06-03 18:55:18 +03:00
2025-06-03 18:55:18 +03:00
2025-06-23 20:31:59 +03:00
2025-06-23 20:31:59 +03:00
2025-06-03 18:55:18 +03:00
2025-06-23 20:31:59 +03:00
2025-06-23 20:31:59 +03:00
2025-06-06 19:49:44 +03:00
2025-06-03 18:55:18 +03:00
2025-06-23 20:31:59 +03:00
2025-06-03 18:55:18 +03:00