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 5917a2f8..9760d2ee 100644 Binary files a/Yi.Furion.Net6/Yi.Furion.Web.Entry/yi-sqlsugar-dev.db and b/Yi.Furion.Net6/Yi.Furion.Web.Entry/yi-sqlsugar-dev.db differ