Merge pull request #14723 from abpframework/auto-merge/rel-7-0/1468

Merge branch dev with rel-7.0
4 years ago · 0666c980ea
2 changed files with 2 additions and 2 deletions
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs
@ -15,5 +15,5 @@ public static class TenantConsts
    /// <summary>
    /// Default value: 256
    /// </summary>
-    public static int AdminEmailAddress { get; set; } = 256; 
+    public static int MaxAdminEmailAddressLength { get; set; } = 256; 
 }
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
@ -43,7 +43,7 @@ public class CreateModalModel : TenantManagementPageModel

        [Required]
        [EmailAddress]
-        [DynamicStringLength(typeof(TenantConsts), nameof(TenantConsts.AdminEmailAddress))]
+        [DynamicStringLength(typeof(TenantConsts), nameof(TenantConsts.MaxAdminEmailAddressLength))]

        public string AdminEmailAddress { get; set; }