vzikratyi
b02fbe860c
Merge branch 'develop/3.2' into feature/dynamic-oauth2-new-table
# Conflicts:
# application/src/main/java/org/thingsboard/server/controller/BaseController.java
# application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
# application/src/main/java/org/thingsboard/server/service/security/permission/Resource.java
# application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.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
# dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
# dao/src/test/resources/sql/hsql/drop-all-tables.sql
# dao/src/test/resources/sql/psql/drop-all-tables.sql
# dao/src/test/resources/sql/timescale/drop-all-tables.sql
# ui-ngx/src/app/modules/home/pages/tenant/tenant.component.ts