Merge branch 'refs/heads/abp' into digital-collectibles

# Conflicts: # Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
2024-10-21 23:08:21 +08:00
parent e2dae1c4ab 57ad7ae1a3
commit a518e7b210
6 changed files with 165 additions and 24 deletions
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Account/PhoneCaptchaImageDto.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Account/PhoneCaptchaImageDto.cs
@@ -4,8 +4,8 @@
    {
        public string Phone { get; set; }
        
-        public string? Uuid { get; set; }
+        public string Uuid { get; set; }

-        public string? Code { get; set; }
+        public string Code { get; set; }
    }
 }