update 解决冲突

2021-05-08 14:49:31 +08:00
parent eee309016c
commit 62951f6bd8
3 changed files with 4 additions and 0 deletions
--- a/Api/Ewide.Core/Entity/SysRole.cs
+++ b/Api/Ewide.Core/Entity/SysRole.cs
@@ -75,8 +75,10 @@ namespace Ewide.Core
        [XmlIgnore]
        public List<SysRoleDataScope> SysRoleDataScopes { get; set; }

+        [XmlIgnore]
        public ICollection<SysAreaCode> AreaCodes { get; set; }

+        [XmlIgnore]
        public List<SysRoleArea> SysRoleAreas { get; set; }

        /// <summary>