From c943c1fc748097b7f9431fb80b337e60002b0694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Thu, 20 Apr 2023 23:08:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AE=8C=E6=88=90=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bbs/Dtos/Banner/BannerCreateInputVo.cs | 4 +-- .../Bbs/Dtos/Banner/BannerGetListOutputDto.cs | 4 +-- .../Bbs/Dtos/Banner/BannerGetOutputDto.cs | 4 +-- .../Bbs/Dtos/Banner/BannerUpdateInputVo.cs | 6 ++--- .../Bbs/Dtos/Comment/CommentGetListInputVo.cs | 2 +- .../Bbs/Dtos/Discuss/DiscussCreateInputVo.cs | 8 +++--- .../Dtos/Discuss/DiscussGetListOutputDto.cs | 16 ++++++------ .../Bbs/Dtos/Discuss/DiscussGetOutputDto.cs | 10 ++++---- .../Bbs/Dtos/Discuss/DiscussUpdateInputVo.cs | 8 +++--- .../Bbs/Dtos/MyType/MyTypeCreateInputVo.cs | 4 +-- .../Bbs/Dtos/MyType/MyTypeGetListInputVo.cs | 4 +-- .../Bbs/Dtos/MyType/MyTypeGetListOutputDto.cs | 4 +-- .../Bbs/Dtos/MyType/MyTypeOutputDto.cs | 4 +-- .../Bbs/Dtos/MyType/MyTypeUpdateInputVo.cs | 4 +-- .../Bbs/Dtos/Plate/PlateCreateInputVo.cs | 4 +-- .../Bbs/Dtos/Plate/PlateGetListInputVo.cs | 4 +-- .../Bbs/Dtos/Plate/PlateGetListOutputDto.cs | 4 +-- .../Bbs/Dtos/Plate/PlateGetOutputDto.cs | 4 +-- .../Bbs/Dtos/Plate/PlateUpdateInputVo.cs | 4 +-- .../Bbs/Entities/BannerEntity.cs | 4 +-- .../Bbs/Entities/DiscussEntity.cs | 12 ++++----- .../Bbs/Entities/MyTypeEntity.cs | 4 +-- .../Bbs/Entities/PlateEntity.cs | 4 +-- .../Rbac/Dtos/Account/RegisterDto.cs | 4 +-- .../Rbac/Dtos/Account/UpdateIconDto.cs | 2 +- .../Rbac/Dtos/Config/ConfigCreateInputVo.cs | 4 +-- .../Rbac/Dtos/Config/ConfigGetListInputVo.cs | 4 +-- .../Dtos/Config/ConfigGetListOutputDto.cs | 4 +-- .../Rbac/Dtos/Config/ConfigGetOutputDto.cs | 4 +-- .../Rbac/Dtos/Config/ConfigUpdateInputVo.cs | 4 +-- .../Rbac/Dtos/Dept/DeptCreateInputVo.cs | 4 +-- .../Rbac/Dtos/Dept/DeptGetListInputVo.cs | 6 ++--- .../Rbac/Dtos/Dept/DeptGetListOutputDto.cs | 4 +-- .../Rbac/Dtos/Dept/DeptGetOutputDto.cs | 4 +-- .../Rbac/Dtos/Dept/DeptUpdateInputVo.cs | 4 +-- .../Dtos/LoginLog/LoginLogGetListInputVo.cs | 4 +-- .../Dtos/LoginLog/LoginLogGetListOutputDto.cs | 12 ++++----- .../Rbac/Dtos/Menu/MenuCreateInputVo.cs | 13 +++++----- .../Rbac/Dtos/Menu/MenuGetListInputVo.cs | 2 +- .../Rbac/Dtos/Menu/MenuGetListOutputDto.cs | 12 ++++----- .../Rbac/Dtos/Menu/MenuGetOutputDto.cs | 12 ++++----- .../Rbac/Dtos/Menu/MenuUpdateInputVo.cs | 14 +++++----- .../MonitorCacheGetListOutputDto.cs | 2 +- .../MonitorCacheNameGetListOutputDto.cs | 2 +- .../Rbac/Dtos/Post/PostCreateInputVo.cs | 2 +- .../Rbac/Dtos/Post/PostGetListInputVo.cs | 2 +- .../Rbac/Dtos/Post/PostGetListOutputDto.cs | 2 +- .../Rbac/Dtos/Post/PostGetOutputDto.cs | 2 +- .../Rbac/Dtos/Post/PostUpdateInputVo.cs | 2 +- .../Rbac/Dtos/Role/RoleCreateInputVo.cs | 6 ++--- .../Rbac/Dtos/Role/RoleGetListInputVo.cs | 5 ++-- .../Rbac/Dtos/Role/RoleGetListOutputDto.cs | 6 ++--- .../Rbac/Dtos/Role/RoleGetOutputDto.cs | 6 ++--- .../Rbac/Dtos/Role/RoleUpdateInputVo.cs | 6 ++--- .../Rbac/Dtos/User/ProfileUpdateInputVo.cs | 12 ++++----- .../Rbac/Dtos/User/UserCreateInputVo.cs | 20 +++++++-------- .../Rbac/Dtos/User/UserGetListInputVo.cs | 7 +++-- .../Rbac/Dtos/User/UserGetListOutputDto.cs | 16 ++++++------ .../Rbac/Dtos/User/UserGetOutputDto.cs | 16 ++++++------ .../Rbac/Dtos/User/UserUpdateInputVo.cs | 24 +++++++++--------- .../Rbac/Entities/ConfigEntity.cs | 4 +-- .../Rbac/Entities/LoginLogEntity.cs | 12 ++++----- .../Rbac/Entities/MenuEntity.cs | 2 +- .../Rbac/Entities/RoleDeptEntity.cs | 4 +-- .../Rbac/Entities/RoleEntity.cs | 6 ++--- .../Rbac/Entities/UserEntity.cs | 2 +- .../Yi.Furion.Web.Entry/appsettings.json | 4 +-- .../Yi.Furion.Web.Entry/yi-sqlsugar-dev.db | Bin 221184 -> 221184 bytes 68 files changed, 206 insertions(+), 209 deletions(-) diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerCreateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerCreateInputVo.cs index 2852f68d..b88fdafc 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerCreateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerCreateInputVo.cs @@ -12,7 +12,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Banner public class BannerCreateInputVo { public string Name { get; set; } - public string Logo { get; set; } - public string Color { get; set; } + public string? Logo { get; set; } + public string? Color { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerGetListOutputDto.cs index bdbb2354..f7623612 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerGetListOutputDto.cs @@ -7,8 +7,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.Banner public long Id { get; set; } public string Name { get; set; } - public string Logo { get; set; } - public string Color { get; set; } + public string? Logo { get; set; } + public string? Color { get; set; } public DateTime CreationTime { get; set; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerGetOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerGetOutputDto.cs index 3a42b7b9..376b61c1 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerGetOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerGetOutputDto.cs @@ -7,8 +7,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.Banner public long Id { get; set; } public string Name { get; set; } - public string Logo { get; set; } - public string Color { get; set; } + public string? Logo { get; set; } + public string? Color { get; set; } public DateTime CreationTime { get; set; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerUpdateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerUpdateInputVo.cs index 8a4c7123..40845922 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerUpdateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerUpdateInputVo.cs @@ -2,8 +2,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.Banner { public class BannerUpdateInputVo { - public string Name { get; set; } - public string Logo { get; set; } - public string Color { get; set; } + public string? Name { get; set; } + public string? Logo { get; set; } + public string? Color { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Comment/CommentGetListInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Comment/CommentGetListInputVo.cs index 1d1f01b5..1fec7414 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Comment/CommentGetListInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Comment/CommentGetListInputVo.cs @@ -5,7 +5,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Comment public class CommentGetListInputVo { public DateTime? creationTime { get; set; } - public string Content { get; set; } + public string? Content { get; set; } //应该选择具体莫个主题查询 public long? DiscussId { get; set; } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussCreateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussCreateInputVo.cs index 0c1e7ba2..77f792a3 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussCreateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussCreateInputVo.cs @@ -13,11 +13,11 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss public class DiscussCreateInputVo { public string Title { get; set; } - public string Types { get; set; } - public string Introduction { get; set; } + public string? Types { get; set; } + public string? Introduction { get; set; } public DateTime? CreateTime { get; set; } = DateTime.Now; public string Content { get; set; } - public string Color { get; set; } + public string? Color { get; set; } public long PlateId { get; set; } @@ -28,6 +28,6 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss /// /// 灏侀潰 /// - public string Cover { get; set; } + public string? Cover { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetListOutputDto.cs index 4c62f369..bc9c0f9d 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetListOutputDto.cs @@ -16,14 +16,14 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss public long Id { get; set; } public string Title { get; set; } public string Types { get; set; } - public string Introduction { get; set; } + public string? Introduction { get; set; } public int AgreeNum { get; set; } public int SeeNum { get; set; } //批量查询,不给内容,性能考虑 //public string Content { get; set; } - public string Color { get; set; } + public string? Color { get; set; } public long PlateId { get; set; } @@ -38,10 +38,10 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss /// /// 封面 /// - public string Cover { get; set; } + public string? Cover { get; set; } //私有需要判断code权限 - public string PrivateCode { get; set; } + public string? PrivateCode { get; set; } public DateTime CreationTime { get; set; } public List PermissionUserIds { get; set; } @@ -50,11 +50,11 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss public void SetBan() { - Title = DiscussConst.私密; - Introduction = ""; - Cover = null; + this.Title = DiscussConst.私密; + this.Introduction = ""; + this.Cover = null; //被禁止 - IsBan = true; + this.IsBan = true; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetOutputDto.cs index 1e07da58..0bf7aeec 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetOutputDto.cs @@ -11,12 +11,12 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss public long Id { get; set; } public string Title { get; set; } - public string Types { get; set; } - public string Introduction { get; set; } + public string? Types { get; set; } + public string? Introduction { get; set; } public int AgreeNum { get; set; } public int SeeNum { get; set; } public string Content { get; set; } - public string Color { get; set; } + public string? Color { get; set; } public long PlateId { get; set; } //是否置顶,默认false @@ -25,12 +25,12 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss /// /// 封面 /// - public string Cover { get; set; } + public string? Cover { get; set; } //是否私有,默认false public bool IsPrivate { get; set; } //私有需要判断code权限 - public string PrivateCode { get; set; } + public string? PrivateCode { get; set; } public DateTime CreationTime { get; set; } public DiscussPermissionTypeEnum PermissionType { get; set; } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussUpdateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussUpdateInputVo.cs index e05d69bf..ce4e43e7 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussUpdateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussUpdateInputVo.cs @@ -6,12 +6,12 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss public class DiscussUpdateInputVo { public string Title { get; set; } - public string Types { get; set; } - public string Introduction { get; set; } + public string? Types { get; set; } + public string? Introduction { get; set; } public int AgreeNum { get; set; } public int SeeNum { get; set; } public string Content { get; set; } - public string Color { get; set; } + public string? Color { get; set; } public List PermissionUserIds { get; set; } @@ -20,6 +20,6 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss /// /// 封面 /// - public string Cover { get; set; } + public string? Cover { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeCreateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeCreateInputVo.cs index ccb60f43..ee121055 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeCreateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeCreateInputVo.cs @@ -12,7 +12,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.MyType public class MyTypeCreateInputVo { public string Name { get; set; } - public string Color { get; set; } - public string BackgroundColor { get; set; } + public string? Color { get; set; } + public string? BackgroundColor { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeGetListInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeGetListInputVo.cs index 30b1b0f7..da59f8d9 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeGetListInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeGetListInputVo.cs @@ -12,8 +12,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.MyType { public long Id { get; set; } public string Name { get; set; } - public string Color { get; set; } - public string BackgroundColor { get; set; } + public string? Color { get; set; } + public string? BackgroundColor { get; set; } public long UserId { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeGetListOutputDto.cs index 510614ea..15805444 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeGetListOutputDto.cs @@ -6,8 +6,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.MyType { public long Id { get; set; } public string Name { get; set; } - public string Color { get; set; } - public string BackgroundColor { get; set; } + public string? Color { get; set; } + public string? BackgroundColor { get; set; } public long UserId { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeOutputDto.cs index 2fb68817..f202a9c6 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeOutputDto.cs @@ -6,8 +6,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.MyType { public long Id { get; set; } public string Name { get; set; } - public string Color { get; set; } - public string BackgroundColor { get; set; } + public string? Color { get; set; } + public string? BackgroundColor { get; set; } public long UserId { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeUpdateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeUpdateInputVo.cs index beadb345..973259fe 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeUpdateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeUpdateInputVo.cs @@ -10,8 +10,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.MyType { public long Id { get; set; } public string Name { get; set; } - public string Color { get; set; } - public string BackgroundColor { get; set; } + public string? Color { get; set; } + public string? BackgroundColor { get; set; } public long UserId { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateCreateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateCreateInputVo.cs index 4bee84ef..9e4db9a6 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateCreateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateCreateInputVo.cs @@ -13,7 +13,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Plate { public long Id { get; set; } public string Name { get; set; } - public string Logo { get; set; } - public string Introduction { get; set; } + public string? Logo { get; set; } + public string? Introduction { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetListInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetListInputVo.cs index 098bf305..fb7f652d 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetListInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetListInputVo.cs @@ -6,7 +6,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Plate { public long Id { get; set; } public string Name { get; set; } - public string Logo { get; set; } - public string Introduction { get; set; } + public string? Logo { get; set; } + public string? Introduction { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetListOutputDto.cs index ff545a13..ecda2ba0 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetListOutputDto.cs @@ -14,7 +14,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Plate public long Id { get; set; } public string Name { get; set; } - public string Logo { get; set; } - public string Introduction { get; set; } + public string? Logo { get; set; } + public string? Introduction { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetOutputDto.cs index 502c75ef..d526400f 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetOutputDto.cs @@ -6,7 +6,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Plate { public long Id { get; set; } public string Name { get; set; } - public string Logo { get; set; } - public string Introduction { get; set; } + public string? Logo { get; set; } + public string? Introduction { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateUpdateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateUpdateInputVo.cs index cb9cb7dd..56804705 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateUpdateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateUpdateInputVo.cs @@ -12,7 +12,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Plate public long Id { get; set; } public string Name { get; set; } - public string Logo { get; set; } - public string Introduction { get; set; } + public string? Logo { get; set; } + public string? Introduction { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/BannerEntity.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/BannerEntity.cs index 823ca1de..6acc1254 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/BannerEntity.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/BannerEntity.cs @@ -12,8 +12,8 @@ namespace Yi.Furion.Core.Bbs.Entities [SugarColumn(IsPrimaryKey = true)] public long Id { get; set; } public string Name { get; set; } - public string Logo { get; set; } - public string Color { get; set; } + public string? Logo { get; set; } + public string? Color { get; set; } public bool IsDeleted { get; set; } public DateTime CreationTime { get; set; } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/DiscussEntity.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/DiscussEntity.cs index f5f47c3a..46b8c96c 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/DiscussEntity.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/DiscussEntity.cs @@ -21,20 +21,20 @@ namespace Yi.Furion.Core.Bbs.Entities [SugarColumn(IsPrimaryKey = true)] public long Id { get; set; } - public string Title { get; set; } - public string Types { get; set; } - public string Introduction { get; set; } + public string? Title { get; set; } + public string? Types { get; set; } + public string? Introduction { get; set; } public int AgreeNum { get; set; } public int SeeNum { get; set; } /// /// 灏侀潰 /// - public string Cover { get; set; } + public string? Cover { get; set; } [SugarColumn(Length = 999999)] public string Content { get; set; } - public string Color { get; set; } + public string? Color { get; set; } public bool IsDeleted { get; set; } @@ -58,6 +58,6 @@ namespace Yi.Furion.Core.Bbs.Entities /// 褰揚ermissionType涓洪儴鍒嗙敤鎴锋椂鍊欙紝浠ヤ笅鍒楄〃涓殑鐢ㄦ埛+鍒涘缓鑰 浠h〃鎷ユ湁鏉冮檺 /// [SugarColumn(IsJson = true)]//浣跨敤json澶勭悊 - public List PermissionUserIds { get; set; } + public List? PermissionUserIds { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/MyTypeEntity.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/MyTypeEntity.cs index 42d01639..bcbf5e5f 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/MyTypeEntity.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/MyTypeEntity.cs @@ -12,8 +12,8 @@ namespace Yi.Furion.Core.Bbs.Entities public bool IsDeleted { get; set; } public string Name { get; set; } - public string Color { get; set; } - public string BackgroundColor { get; set; } + public string? Color { get; set; } + public string? BackgroundColor { get; set; } public long UserId { get; set; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/PlateEntity.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/PlateEntity.cs index b0e160e3..9207af32 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/PlateEntity.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/PlateEntity.cs @@ -11,8 +11,8 @@ namespace Yi.Furion.Core.Bbs.Entities [SugarColumn(IsPrimaryKey = true)] public long Id { get; set; } public string Name { get; set; } - public string Logo { get; set; } - public string Introduction { get; set; } + public string? Logo { get; set; } + public string? Introduction { get; set; } public bool IsDeleted { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Account/RegisterDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Account/RegisterDto.cs index 1fb71f1f..a9eef12d 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Account/RegisterDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Account/RegisterDto.cs @@ -24,7 +24,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Account /// /// 鍞竴鏍囪瘑鐮 /// - public string Uuid { get; set; } + public string? Uuid { get; set; } /// /// 鐢佃瘽 @@ -34,6 +34,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Account /// /// 楠岃瘉鐮 /// - public string Code { get; set; } + public string? Code { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Account/UpdateIconDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Account/UpdateIconDto.cs index d3bccb76..2d5550be 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Account/UpdateIconDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Account/UpdateIconDto.cs @@ -8,6 +8,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Account { public class UpdateIconDto { - public string Icon { get; set; } + public string? Icon { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigCreateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigCreateInputVo.cs index b0fb7589..f90b943a 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigCreateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigCreateInputVo.cs @@ -9,9 +9,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config public string ConfigName { get; set; } = string.Empty; public string ConfigKey { get; set; } = string.Empty; public string ConfigValue { get; set; } = string.Empty; - public string ConfigType { get; set; } + public string? ConfigType { get; set; } public int OrderNum { get; set; } - public string Remark { get; set; } + public string? Remark { get; set; } public DateTime CreationTime { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetListInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetListInputVo.cs index b3ac2e84..5c98c99e 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetListInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetListInputVo.cs @@ -10,12 +10,12 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config /// /// 配置名称 /// - public string ConfigName { get; set; } + public string? ConfigName { get; set; } /// /// 配置键 /// - public string ConfigKey { get; set; } + public string? ConfigKey { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetListOutputDto.cs index 451ab2a9..a73cef0c 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetListOutputDto.cs @@ -21,7 +21,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config /// /// 配置类型 /// - public string ConfigType { get; set; } + public string? ConfigType { get; set; } /// /// 排序字段 /// @@ -30,7 +30,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config /// /// 备注 /// - public string Remark { get; set; } + public string? Remark { get; set; } /// /// 创建时间 diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetOutputDto.cs index fa6988c2..b1b3eb91 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetOutputDto.cs @@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config public string ConfigName { get; set; } = string.Empty; public string ConfigKey { get; set; } = string.Empty; public string ConfigValue { get; set; } = string.Empty; - public string ConfigType { get; set; } + public string? ConfigType { get; set; } public int OrderNum { get; set; } - public string Remark { get; set; } + public string? Remark { get; set; } public DateTime CreationTime { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigUpdateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigUpdateInputVo.cs index 36cf3d6e..23b18ac1 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigUpdateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigUpdateInputVo.cs @@ -6,9 +6,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config public string ConfigName { get; set; } = string.Empty; public string ConfigKey { get; set; } = string.Empty; public string ConfigValue { get; set; } = string.Empty; - public string ConfigType { get; set; } + public string? ConfigType { get; set; } public int OrderNum { get; set; } - public string Remark { get; set; } + public string? Remark { get; set; } public DateTime CreationTime { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptCreateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptCreateInputVo.cs index a1fc8af8..e1f684ff 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptCreateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptCreateInputVo.cs @@ -17,8 +17,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept public bool State { get; set; } public string DeptName { get; set; } = string.Empty; public string DeptCode { get; set; } = string.Empty; - public string Leader { get; set; } + public string? Leader { get; set; } public long ParentId { get; set; } - public string Remark { get; set; } + public string? Remark { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetListInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetListInputVo.cs index f21a1b55..089fe2c3 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetListInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetListInputVo.cs @@ -6,9 +6,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept { public long Id { get; set; } public bool? State { get; set; } - public string DeptName { get; set; } - public string DeptCode { get; set; } - public string Leader { get; set; } + public string? DeptName { get; set; } + public string? DeptCode { get; set; } + public string? Leader { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetListOutputDto.cs index ea199409..92eac656 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetListOutputDto.cs @@ -11,9 +11,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept public bool State { get; set; } public string DeptName { get; set; } = string.Empty; public string DeptCode { get; set; } = string.Empty; - public string Leader { get; set; } + public string? Leader { get; set; } public long ParentId { get; set; } - public string Remark { get; set; } + public string? Remark { get; set; } public int OrderNum { get; set; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetOutputDto.cs index 9041cc6c..63c98736 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetOutputDto.cs @@ -8,8 +8,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept public bool State { get; set; } public string DeptName { get; set; } = string.Empty; public string DeptCode { get; set; } = string.Empty; - public string Leader { get; set; } - public string Remark { get; set; } + public string? Leader { get; set; } + public string? Remark { get; set; } public long? deptId { get; set; } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptUpdateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptUpdateInputVo.cs index bec54b5a..ed2e61df 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptUpdateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptUpdateInputVo.cs @@ -14,8 +14,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept public bool State { get; set; } public string DeptName { get; set; } = string.Empty; public string DeptCode { get; set; } = string.Empty; - public string Leader { get; set; } + public string? Leader { get; set; } public long ParentId { get; set; } - public string Remark { get; set; } + public string? Remark { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/LoginLog/LoginLogGetListInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/LoginLog/LoginLogGetListInputVo.cs index 927d935e..8f12bfe1 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/LoginLog/LoginLogGetListInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/LoginLog/LoginLogGetListInputVo.cs @@ -4,8 +4,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.LoginLog { public class LoginLogGetListInputVo : PagedAllResultRequestDto { - public string LoginUser { get; set; } + public string? LoginUser { get; set; } - public string LoginIp { get; set; } + public string? LoginIp { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/LoginLog/LoginLogGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/LoginLog/LoginLogGetListOutputDto.cs index 035c2dd6..4a8e1adb 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/LoginLog/LoginLogGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/LoginLog/LoginLogGetListOutputDto.cs @@ -7,25 +7,25 @@ namespace Yi.Furion.Core.Rbac.Dtos.LoginLog public DateTime CreationTime { get; } - public string LoginUser { get; set; } + public string? LoginUser { get; set; } - public string LoginLocation { get; set; } + public string? LoginLocation { get; set; } /// /// 鐧诲綍Ip /// - public string LoginIp { get; set; } + public string? LoginIp { get; set; } /// /// 娴忚鍣 /// - public string Browser { get; set; } + public string? Browser { get; set; } /// /// 鎿嶄綔绯荤粺 /// - public string Os { get; set; } + public string? Os { get; set; } /// /// 鐧诲綍淇℃伅 /// - public string LogMsg { get; set; } + public string? LogMsg { get; set; } public long? CreatorId { get; set; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuCreateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuCreateInputVo.cs index 7cf255ec..e717ba2d 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuCreateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuCreateInputVo.cs @@ -14,16 +14,15 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu public bool State { get; set; } public string MenuName { get; set; } = string.Empty; public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu; - public string PermissionCode { get; set; } + public string? PermissionCode { get; set; } public long ParentId { get; set; } - public string MenuIcon { get; set; } - public string Router { get; set; } + public string? MenuIcon { get; set; } + public string? Router { get; set; } public bool IsLink { get; set; } public bool IsCache { get; set; } public bool IsShow { get; set; } = true; - public string Remark { get; set; } - public string Component { get; set; } - public string Query { get; set; } - public int OrderNum { get; set; } + public string? Remark { get; set; } + public string? Component { get; set; } + public string? Query { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetListInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetListInputVo.cs index af12af59..e5d3bf91 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetListInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetListInputVo.cs @@ -6,7 +6,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu { public bool? State { get; set; } - public string MenuName { get; set; } + public string? MenuName { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetListOutputDto.cs index 4bcb24f4..7de6c8bc 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetListOutputDto.cs @@ -12,16 +12,16 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu public bool State { get; set; } public string MenuName { get; set; } = string.Empty; public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu; - public string PermissionCode { get; set; } + public string? PermissionCode { get; set; } public long ParentId { get; set; } - public string MenuIcon { get; set; } - public string Router { get; set; } + public string? MenuIcon { get; set; } + public string? Router { get; set; } public bool IsLink { get; set; } public bool IsCache { get; set; } public bool IsShow { get; set; } = true; - public string Remark { get; set; } - public string Component { get; set; } - public string Query { get; set; } + public string? Remark { get; set; } + public string? Component { get; set; } + public string? Query { get; set; } public int OrderNum { get; set; } //public List? Children { get; set; } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetOutputDto.cs index c7351809..89973aaa 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetOutputDto.cs @@ -12,16 +12,16 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu public bool State { get; set; } public string MenuName { get; set; } = string.Empty; public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu; - public string PermissionCode { get; set; } + public string? PermissionCode { get; set; } public long ParentId { get; set; } - public string MenuIcon { get; set; } - public string Router { get; set; } + public string? MenuIcon { get; set; } + public string? Router { get; set; } public bool IsLink { get; set; } public bool IsCache { get; set; } public bool IsShow { get; set; } = true; - public string Remark { get; set; } - public string Component { get; set; } - public string Query { get; set; } + public string? Remark { get; set; } + public string? Component { get; set; } + public string? Query { get; set; } public int OrderNum { get; set; } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuUpdateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuUpdateInputVo.cs index 6764e94e..a1414b6f 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuUpdateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuUpdateInputVo.cs @@ -11,18 +11,16 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu public bool State { get; set; } public string MenuName { get; set; } = string.Empty; public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu; - public string PermissionCode { get; set; } + public string? PermissionCode { get; set; } public long ParentId { get; set; } - public string MenuIcon { get; set; } - public string Router { get; set; } + public string? MenuIcon { get; set; } + public string? Router { get; set; } public bool IsLink { get; set; } public bool IsCache { get; set; } public bool IsShow { get; set; } = true; - public string Remark { get; set; } - public string Component { get; set; } - public string Query { get; set; } - - public int OrderNum { get; set; } + public string? Remark { get; set; } + public string? Component { get; set; } + public string? Query { get; set; } //public List? Children { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/MonitorCache/MonitorCacheGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/MonitorCache/MonitorCacheGetListOutputDto.cs index 356a5fa3..3f1fcd5f 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/MonitorCache/MonitorCacheGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/MonitorCache/MonitorCacheGetListOutputDto.cs @@ -11,6 +11,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.MonitorCache public string CacheName { get; set; } public string CacheKey { get; set; } public string CacheValue { get; set; } - public string Remark { get; set; } + public string? Remark { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/MonitorCache/MonitorCacheNameGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/MonitorCache/MonitorCacheNameGetListOutputDto.cs index 27baa273..cd4e725c 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/MonitorCache/MonitorCacheNameGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/MonitorCache/MonitorCacheNameGetListOutputDto.cs @@ -9,6 +9,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.MonitorCache public class MonitorCacheNameGetListOutputDto { public string CacheName { get; set; } - public string Remark { get; set; } + public string? Remark { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostCreateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostCreateInputVo.cs index 24520a85..23bcf11d 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostCreateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostCreateInputVo.cs @@ -17,6 +17,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post public bool State { get; set; } public string PostCode { get; set; } = string.Empty; public string PostName { get; set; } = string.Empty; - public string Remark { get; set; } + public string? Remark { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetListInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetListInputVo.cs index 7501824e..022569d0 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetListInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetListInputVo.cs @@ -6,6 +6,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post { public bool? State { get; set; } //public string? PostCode { get; set; }=string.Empty; - public string PostName { get; set; } = string.Empty; + public string? PostName { get; set; } = string.Empty; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetListOutputDto.cs index 26d0e1cc..bbe01fab 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetListOutputDto.cs @@ -9,7 +9,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post public bool State { get; set; } public string PostCode { get; set; } = string.Empty; public string PostName { get; set; } = string.Empty; - public string Remark { get; set; } + public string? Remark { get; set; } public int OrderNum { get; set; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetOutputDto.cs index e2ffdd98..2ac195f0 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetOutputDto.cs @@ -11,7 +11,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post public bool State { get; set; } public string PostCode { get; set; } = string.Empty; public string PostName { get; set; } = string.Empty; - public string Remark { get; set; } + public string? Remark { get; set; } public int OrderNum { get; set; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostUpdateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostUpdateInputVo.cs index dff3377b..97460faa 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostUpdateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostUpdateInputVo.cs @@ -10,6 +10,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post public bool State { get; set; } public string PostCode { get; set; } = string.Empty; public string PostName { get; set; } = string.Empty; - public string Remark { get; set; } + public string? Remark { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleCreateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleCreateInputVo.cs index cdbc4d84..90ce4b6f 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleCreateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleCreateInputVo.cs @@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role /// public class RoleCreateInputVo { - public string RoleName { get; set; } - public string RoleCode { get; set; } - public string Remark { get; set; } + public string? RoleName { get; set; } + public string? RoleCode { get; set; } + public string? Remark { get; set; } public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL; public bool State { get; set; } = true; diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetListInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetListInputVo.cs index c00de310..0d441b44 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetListInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetListInputVo.cs @@ -4,9 +4,10 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role { public class RoleGetListInputVo : PagedAllResultRequestDto { - public string RoleName { get; set; } - public string RoleCode { get; set; } + public string? RoleName { get; set; } + public string? RoleCode { get; set; } public bool? State { get; set; } + } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetListOutputDto.cs index 3ac71988..20f83fd5 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetListOutputDto.cs @@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role public long Id { get; set; } public DateTime CreationTime { get; set; } = DateTime.Now; public long? CreatorId { get; set; } - public string RoleName { get; set; } - public string RoleCode { get; set; } - public string Remark { get; set; } + public string? RoleName { get; set; } + public string? RoleCode { get; set; } + public string? Remark { get; set; } public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL; public bool State { get; set; } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetOutputDto.cs index 8bd84765..30c165d9 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetOutputDto.cs @@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role public long Id { get; set; } public DateTime CreationTime { get; set; } = DateTime.Now; public long? CreatorId { get; set; } - public string RoleName { get; set; } - public string RoleCode { get; set; } - public string Remark { get; set; } + public string? RoleName { get; set; } + public string? RoleCode { get; set; } + public string? Remark { get; set; } public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL; public bool State { get; set; } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleUpdateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleUpdateInputVo.cs index 2391123e..6fb8a8b0 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleUpdateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleUpdateInputVo.cs @@ -4,9 +4,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role { public class RoleUpdateInputVo { - public string RoleName { get; set; } - public string RoleCode { get; set; } - public string Remark { get; set; } + public string? RoleName { get; set; } + public string? RoleCode { get; set; } + public string? Remark { get; set; } public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL; public bool State { get; set; } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/ProfileUpdateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/ProfileUpdateInputVo.cs index 4ccc9d5b..7768e596 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/ProfileUpdateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/ProfileUpdateInputVo.cs @@ -4,14 +4,14 @@ namespace Yi.Furion.Core.Rbac.Dtos.User { public class ProfileUpdateInputVo { - public string Name { get; set; } + public string? Name { get; set; } public int? Age { get; set; } - public string Nick { get; set; } - public string Email { get; set; } - public string Address { get; set; } + public string? Nick { get; set; } + public string? Email { get; set; } + public string? Address { get; set; } public long? Phone { get; set; } - public string Introduction { get; set; } - public string Remark { get; set; } + public string? Introduction { get; set; } + public string? Remark { get; set; } public SexEnum? Sex { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserCreateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserCreateInputVo.cs index e8225889..3325a2ef 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserCreateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserCreateInputVo.cs @@ -8,21 +8,21 @@ namespace Yi.Furion.Core.Rbac.Dtos.User /// public class UserCreateInputVo { - public string Name { get; set; } + public string? Name { get; set; } public int? Age { get; set; } public string UserName { get; set; } = string.Empty; public string Password { get; set; } = string.Empty; - public string Icon { get; set; } - public string Nick { get; set; } - public string Email { get; set; } - public string Address { get; set; } + public string? Icon { get; set; } + public string? Nick { get; set; } + public string? Email { get; set; } + public string? Address { get; set; } public long? Phone { get; set; } - public string Introduction { get; set; } - public string Remark { get; set; } + public string? Introduction { get; set; } + public string? Remark { get; set; } public SexEnum Sex { get; set; } = SexEnum.Unknown; - public List RoleIds { get; set; } - public List PostIds { get; set; } + public List? RoleIds { get; set; } + public List? PostIds { get; set; } public long? DeptId { get; set; } public bool State { get; set; } = true; } -} + } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetListInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetListInputVo.cs index 4ee05e56..8a73f56c 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetListInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetListInputVo.cs @@ -4,15 +4,14 @@ namespace Yi.Furion.Core.Rbac.Dtos.User { public class UserGetListInputVo : PagedAllResultRequestDto { - public string Name { get; set; } - public string UserName { get; set; } + public string? Name { get; set; } + public string? UserName { get; set; } public long? Phone { get; set; } public bool? State { get; set; } public long? DeptId { get; set; } - public string Ids { get; set; } - + public string? Ids { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetListOutputDto.cs index bdbfcd59..63cb59ee 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetListOutputDto.cs @@ -6,17 +6,17 @@ namespace Yi.Furion.Core.Rbac.Dtos.User public class UserGetListOutputDto : IEntityDto { public long Id { get; set; } - public string Name { get; set; } + public string? Name { get; set; } public int? Age { get; set; } public string UserName { get; set; } = string.Empty; - public string Icon { get; set; } - public string Nick { get; set; } - public string Email { get; set; } - public string Ip { get; set; } - public string Address { get; set; } + public string? Icon { get; set; } + public string? Nick { get; set; } + public string? Email { get; set; } + public string? Ip { get; set; } + public string? Address { get; set; } public long? Phone { get; set; } - public string Introduction { get; set; } - public string Remark { get; set; } + public string? Introduction { get; set; } + public string? Remark { get; set; } public SexEnum Sex { get; set; } = SexEnum.Unknown; public long? DeptId { get; set; } public DateTime CreationTime { get; set; } = DateTime.Now; diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetOutputDto.cs index 996316b2..8930fe43 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetOutputDto.cs @@ -9,17 +9,17 @@ namespace Yi.Furion.Core.Rbac.Dtos.User public class UserGetOutputDto : IEntityDto { public long Id { get; set; } - public string Name { get; set; } + public string? Name { get; set; } public int? Age { get; set; } public string UserName { get; set; } = string.Empty; - public string Icon { get; set; } - public string Nick { get; set; } - public string Email { get; set; } - public string Ip { get; set; } - public string Address { get; set; } + public string? Icon { get; set; } + public string? Nick { get; set; } + public string? Email { get; set; } + public string? Ip { get; set; } + public string? Address { get; set; } public long? Phone { get; set; } - public string Introduction { get; set; } - public string Remark { get; set; } + public string? Introduction { get; set; } + public string? Remark { get; set; } public SexEnum Sex { get; set; } = SexEnum.Unknown; public bool State { get; set; } public DateTime CreationTime { get; set; } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserUpdateInputVo.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserUpdateInputVo.cs index 33eaa2e3..312e9100 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserUpdateInputVo.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserUpdateInputVo.cs @@ -4,25 +4,25 @@ namespace Yi.Furion.Core.Rbac.Dtos.User { public class UserUpdateInputVo { - public string Name { get; set; } + public string? Name { get; set; } public int? Age { get; set; } - public string UserName { get; set; } + public string? UserName { get; set; } [AdaptIgnore] - public string Password { get; set; } - public string Icon { get; set; } - public string Nick { get; set; } - public string Email { get; set; } - public string Ip { get; set; } - public string Address { get; set; } + public string? Password { get; set; } + public string? Icon { get; set; } + public string? Nick { get; set; } + public string? Email { get; set; } + public string? Ip { get; set; } + public string? Address { get; set; } public long? Phone { get; set; } - public string Introduction { get; set; } - public string Remark { get; set; } + public string? Introduction { get; set; } + public string? Remark { get; set; } public SexEnum? Sex { get; set; } public long? DeptId { get; set; } - public List PostIds { get; set; } + public List? PostIds { get; set; } - public List RoleIds { get; set; } + public List? RoleIds { get; set; } public bool? State { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/ConfigEntity.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/ConfigEntity.cs index b4b3ba27..d93436fc 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/ConfigEntity.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/ConfigEntity.cs @@ -32,7 +32,7 @@ namespace Yi.Furion.Core.Rbac.Entities /// 閰嶇疆绫诲埆 /// [SugarColumn(ColumnName = "ConfigType")] - public string ConfigType { get; set; } + public string? ConfigType { get; set; } /// @@ -44,7 +44,7 @@ namespace Yi.Furion.Core.Rbac.Entities /// 鎻忚堪 /// [SugarColumn(ColumnName = "Remark")] - public string Remark { get; set; } + public string? Remark { get; set; } public bool IsDeleted { get; set; } public DateTime CreationTime { get; set; } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/LoginLogEntity.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/LoginLogEntity.cs index 10e12be6..1cf711a0 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/LoginLogEntity.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/LoginLogEntity.cs @@ -19,32 +19,32 @@ namespace Yi.Furion.Core.Rbac.Entities /// 鐧诲綍鐢ㄦ埛 /// [SugarColumn(ColumnName = "LoginUser")] - public string LoginUser { get; set; } + public string? LoginUser { get; set; } /// /// 鐧诲綍鍦扮偣 /// [SugarColumn(ColumnName = "LoginLocation")] - public string LoginLocation { get; set; } + public string? LoginLocation { get; set; } /// /// 鐧诲綍Ip /// [SugarColumn(ColumnName = "LoginIp")] - public string LoginIp { get; set; } + public string? LoginIp { get; set; } /// /// 娴忚鍣 /// [SugarColumn(ColumnName = "Browser")] - public string Browser { get; set; } + public string? Browser { get; set; } /// /// 鎿嶄綔绯荤粺 /// [SugarColumn(ColumnName = "Os")] - public string Os { get; set; } + public string? Os { get; set; } /// /// 鐧诲綍淇℃伅 /// [SugarColumn(ColumnName = "LogMsg")] - public string LogMsg { get; set; } + public string? LogMsg { get; set; } public long? CreatorId { get; set; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/MenuEntity.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/MenuEntity.cs index ba87a20c..d41e0b5a 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/MenuEntity.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/MenuEntity.cs @@ -121,7 +121,7 @@ namespace Yi.Furion.Core.Rbac.Entities public string? Query { get; set; } [SugarColumn(IsIgnore = true)] - public List Children { get; set; } + public List? Children { get; set; } } /// diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/RoleDeptEntity.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/RoleDeptEntity.cs index 74ac3899..6b2a1823 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/RoleDeptEntity.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/RoleDeptEntity.cs @@ -23,12 +23,12 @@ public partial class RoleDeptEntity : IEntity /// 瑙掕壊id /// [SugarColumn(ColumnName = "RoleId")] - public long? RoleId { get; set; } + public long RoleId { get; set; } /// /// 閮ㄩ棬id /// [SugarColumn(ColumnName = "DeptId")] - public long? DeptId { get; set; } + public long DeptId { get; set; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/RoleEntity.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/RoleEntity.cs index 6097ab81..c8ea347f 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/RoleEntity.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/RoleEntity.cs @@ -66,7 +66,7 @@ namespace Yi.Furion.Core.Rbac.Entities /// 鎻忚堪 /// [SugarColumn(ColumnName = "Remark")] - public string Remark { get; set; } + public string? Remark { get; set; } /// /// 瑙掕壊鏁版嵁鑼冨洿 /// @@ -80,9 +80,9 @@ namespace Yi.Furion.Core.Rbac.Entities [Navigate(typeof(RoleMenuEntity), nameof(RoleMenuEntity.RoleId), nameof(RoleMenuEntity.MenuId))] - public List Menus { get; set; } + public List? Menus { get; set; } [Navigate(typeof(RoleDeptEntity), nameof(RoleDeptEntity.RoleId), nameof(RoleDeptEntity.DeptId))] - public List Depts { get; set; } + public List? Depts { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/UserEntity.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/UserEntity.cs index fa40343a..5f033f1f 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/UserEntity.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/UserEntity.cs @@ -43,7 +43,7 @@ namespace Yi.Furion.Core.Rbac.Entities /// /// 濮撳悕 /// - public string Name { get; set; } + public string? Name { get; set; } /// /// 骞撮緞 diff --git a/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json b/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json index 62fe5d64..03e922e6 100644 --- a/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json +++ b/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json @@ -18,7 +18,7 @@ "Url": "DataSource=yi-sqlsugar-dev.db", "DbType": "Sqlite", "EnabledReadWrite": false, - "EnabledCodeFirst": false, + "EnabledCodeFirst": true, "ReadUrl": [ "DataSource=[xxxx]", //Sqlite "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql @@ -26,7 +26,7 @@ ] }, - "EnabledDataSeed": false, + "EnabledDataSeed": true, "JWTSettings": { "ValidateIssuerSigningKey": true, // 鏄惁楠岃瘉瀵嗛挜锛宐ool 绫诲瀷锛岄粯璁rue diff --git a/Yi.Furion.Net6/Yi.Furion.Web.Entry/yi-sqlsugar-dev.db b/Yi.Furion.Net6/Yi.Furion.Web.Entry/yi-sqlsugar-dev.db index 5917a2f815629d7abf4e409aa9a1f47657fd65f0..9760d2eeb21f291aed66e56325137a65bfb828b4 100644 GIT binary patch delta 10355 zcmeHNdvH_NnZM^=y)9WXeh48HS;kKs;j5P)0^3-A@_yNtEt5D#5?~zse&NIjl2Ssm zT|;ijZCbYkQqm-C2*qhcVp3<=OlP_?O`GYY?PfB&nJ$vu%`!=W5QqWy+?R9!-E{xh zKe1=*`;&h9o%4O?eCP3fI`F>c!26n`Mqoa+v>N_-%%uHXevz1yUc{S;FmA=IQz^QW zfYRX0m5*xVdXotp($am407X5PtfW&?fr))snF{pmLp%4NqQ8?0QrK5crGgChVflW1 z>C{=mi7OkGa=pO-4inU6>3_oaRMe*uGhLAjGU(nykThkI?;Vo8_F*QjQ&2~rTxD^% z$zr$5vBFVO>Q$;`3ZTr%v#nHMSjJyjmYll$WGTvOQ*f*zlqI9;#_!TXP&vx- z;t5*Bs9>nnjQFb=aIBn|miZ!eAyk$W=aif~a7Y{C+^td*G9Y+Wi2#`b0a7^vBr*gL zQUu@<1ONg77@kDPluSG3i#kk$Vc5$OUFMYJY@-HtB;%q^X(#OtE9tb_$xM5!t1dDy z_tvS%_fG!p=~w?ozsh_ba&eC`S*Bp71DqEcOvcU%__{(&BXa(!$mF~CXefA%(A^?( zF_F2MqqEa*-6aA%@`N3ciE7+$3+zLFB zgd&8P$m~ncM<$Nl-H}=%rcsCt4KAh;{blIH-07LGV1trbGoMfYvvUuG?*C~3k_y!#X9k5-yc?2kCIS{Ql_VFCvp?t?*xT@?D#~WCaO-ZJP#n2m8I9-GQEwflM3e_s_mK z9eMBg?9}w^^a&M=N1(liX|KUH|3{m|$12knweZDXOs{=d@RTm+o>tif+G!`LYhPw5 zScb)yOMUc}zLo{qBJ{xQ^RGsq316By6Mg<2d|=w z&_?LFmX{@zvXxP1{%+=5Zp)@l-sI_7Vszyd3*2NFd5XMZ;Iu7b`t~D9;<+W9u(M!b0Yra~>jZQ|JF+Ms5 zG5V`t@uQPL{r)T7lEq?V>Ge!rd%J<|Xc1@X|X+V!e61b3lk~8TFeRd_?I)G${SeY_35yRdth}3tBPq$jvN)d_o{6i;+LR z$Lr1k@GRwo>*b&3d3)s4fcSr|t89e%E0RQVk@M^1P)VaU(l;pYlQP2b^1E#U!#A!jVa zlq(j>IOTgcYHrJ9lownK!*kzO&NE7Vh0S#*rP`?HNbqxrp ztw%sj9RjLr5#XsoKvgvaA@*VbTV3rz-m0uZK*eeVlvg5PRRsc8mLtHu3ISy+5m4$z zKuK8$LB*vAaFrmyS&RUO3juZ~0&EThkah$V*$}XTjDwKQS`Md}cLHHBW#rXX)6 z>ky#PB0!ytfFun9RB8k$lMtYYo%3Nk^4K{af>8Vp3{m_J3_<)33_<)33_<)33_<)3 z3_<)3%mlthdjr$phcV4(+8K3&CanCcI#vFK^0XADV*)E-ctl#U`V!V6a7&?zL=iL1gWY+ z{RX){Jsmt-Pk)*T#@OVM-vVA>A7oh|jeW?=0_jY;NJX#B;!{n#v-m93zhnU?L!xde z%=DL8;0Dow6;LVo5?Y!KK32NZS^e*N!~dNP`T#4}kqi9F^i(#*b#R>iT`maHp=_X` zla>J;ZQ743!<+NKHvsg6*A)OQAwL#({8O^RY?;2&z}k@N>FDkb_P5)(|9KdO|Ap>+ z5}&6htiXnY*J)}TKSvL)09G9PEj_j$KTekx0rG7UWNP6yPy{c83AcBrjV`YQ7LJm5 z&uxIfZ3_*Mb7eT3WI!R_&(hELK zhRr)Xy2P8VtC+sMAJ{lbVml#aT?jB+H&jV%C#29J!0i8!lGq5BD?A$l|H~M`bS7p5 z1o8Ve(?IOL%}6mus0fV-)5?;y8WX(#YBiyQJ%mA~FaZ6*vU1E|#SGG%LM6r|oRn-1 z%MDec=g&vZoLaPNC^#^TTi0CM((ByZ(NWjBVdvJpWqoTs zzQ(owlA6t~O@m|YjU8jV>l&Iy0z0b%y`JKh;X2O_Ke?`bO?AhfYHwf2GqSO)-Mg#H zzcU!@>F!%!NQWkec$;na*o;Mf`ZKQWMT5}l z_F`+t=$?ILHgDq|vdqy^TDryGGh9{GYa@e!$Gv@?;@&-V!{msQbhLDNYs&il-Cfm= zF>+I5ozqc2uoLDgHoNMYT6g$Mt?R4-fBWWg&&~WGI(a1e%&{*n9E5+P=T0(kVq$LQEPO@G@Dacoo)RDHP>F&aY@8kJ5;#j3 z!(V$b^2X6Lzu!LU@7nA1433d~quzGk*0G*_qm8?3ox^^6kG;0H#!+9qro-CWGSexb)65kz=Rei-|3F z5VK6)htPfk^FG>H_)qwmTB7?mEft!OWxnmss%icDO!!k^&8Lr9q53DI_)VZ}UB-6ekcR$r4F3+R@Zw7Z=PvR#(fD0Ae z@gJnj5>7pM0eX-!yRX>6Tp}N&%ybV@W_$wguB_36lo_+0K1iAA9;D0?pZ;y7;pisf zcYxb?*CyO|>?Hk%Ed*bQX`mOj5PWuZjTqgvmB=q=xAKOA>b3DKx^kt=Vqr=qc!~!+lXAQc2L{i5N{Ba+?%$q6I1x!HX?^t7_W~jC|$C2 zBh%#)q06;m3ZHKy_-t+soz_T{k*o)5MCgGieL6Bj&z?Csd-S_(#>hjDHxkUX6^3lJ z$fxM(Mk1Rl;Z$y~K}t9tu@4xV2)@o(*;XB|Csm2@_calG`nHmOsYw{>)nfENH3>#n z(hD(qr5N4SOjy|ZAnj`=N;z9A#K>3uvn!02-hEMgvu;P*{}qyGSm;?~Om delta 9332 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