diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/VisitController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/VisitController.cs deleted file mode 100644 index 530b399e..00000000 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/VisitController.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Yi.Framework.ApiMicroservice.Controllers -{ - [Route("api/[controller]/[action")] - [ApiController] - public class VisitController : ControllerBase - { - } -} diff --git a/Yi.Framework/Yi.Framework.Model/Models/menu.cs b/Yi.Framework/Yi.Framework.Model/Models/menu.cs index 8602a1f2..5da4bfa7 100644 --- a/Yi.Framework/Yi.Framework.Model/Models/menu.cs +++ b/Yi.Framework/Yi.Framework.Model/Models/menu.cs @@ -14,8 +14,7 @@ namespace Yi.Framework.Model.Models - public ICollection children { get; set; } + public IList children { get; set; } public mould mould { get; set; } - public ICollection roles { get; set; } } } diff --git a/Yi.Framework/Yi.Framework.Model/Models/mould.cs b/Yi.Framework/Yi.Framework.Model/Models/mould.cs index 17ff8a60..f86a5489 100644 --- a/Yi.Framework/Yi.Framework.Model/Models/mould.cs +++ b/Yi.Framework/Yi.Framework.Model/Models/mould.cs @@ -10,6 +10,5 @@ namespace Yi.Framework.Model.Models { public string mould_name { get; set; } public string url { get; set; } - //public menu menu { get; set; } } } diff --git a/Yi.Framework/Yi.Framework.Model/Models/role.cs b/Yi.Framework/Yi.Framework.Model/Models/role.cs index e071074b..2784000a 100644 --- a/Yi.Framework/Yi.Framework.Model/Models/role.cs +++ b/Yi.Framework/Yi.Framework.Model/Models/role.cs @@ -12,7 +12,6 @@ namespace Yi.Framework.Model.Models public string introduce { get; set; } - public ICollection menus { get; set; } - public ICollection users { get; set; } + public IList menus { get; set; } } } diff --git a/Yi.Framework/Yi.Framework.Model/Models/user.cs b/Yi.Framework/Yi.Framework.Model/Models/user.cs index 3a6cdeb7..ff30d822 100644 --- a/Yi.Framework/Yi.Framework.Model/Models/user.cs +++ b/Yi.Framework/Yi.Framework.Model/Models/user.cs @@ -21,7 +21,7 @@ namespace Yi.Framework.Model.Models public int? phone { get; set; } - public ICollection roles { get; set; } + public IList roles { get; set; } } }