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/SysUser.cs
+++ b/Api/Ewide.Core/Entity/SysUser.cs
@@ -132,6 +132,7 @@ namespace Ewide.Core
        [XmlIgnore]
        public List<SysUserDataScope> SysUserDataScopes { get; set; }

+        [XmlIgnore]
        public ICollection<SysAreaCode> AreaCodes { get; set; }
        /// <summary>
        /// 多对多中间表（用户-区域 数据范围）