ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 解决冲突

Browse Source
This commit is contained in:
ky_xiaz
2021-05-08 14:49:31 +08:00
parent eee309016c
commit 62951f6bd8
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Api/Ewide.Core/Entity/SysOrg.cs
View File

@@ -74,6 +74,7 @@ namespace Ewide.Core
/// <summary> /// <summary>
/// 一对一 一个组织对应一个区域代码 /// 一对一 一个组织对应一个区域代码
/// </summary> /// </summary>
[XmlIgnore]
public SysAreaCode Area { get; set; } public SysAreaCode Area { get; set; }
/// <summary> /// <summary>

2
Api/Ewide.Core/Entity/SysRole.cs
View File

@@ -75,8 +75,10 @@ namespace Ewide.Core
[XmlIgnore] [XmlIgnore]
public List<SysRoleDataScope> SysRoleDataScopes { get; set; } public List<SysRoleDataScope> SysRoleDataScopes { get; set; }
[XmlIgnore]
public ICollection<SysAreaCode> AreaCodes { get; set; } public ICollection<SysAreaCode> AreaCodes { get; set; }
[XmlIgnore]
public List<SysRoleArea> SysRoleAreas { get; set; } public List<SysRoleArea> SysRoleAreas { get; set; }
/// <summary> /// <summary>

1
Api/Ewide.Core/Entity/SysUser.cs
View File

@@ -132,6 +132,7 @@ namespace Ewide.Core
[XmlIgnore] [XmlIgnore]
public List<SysUserDataScope> SysUserDataScopes { get; set; } public List<SysUserDataScope> SysUserDataScopes { get; set; }
[XmlIgnore]
public ICollection<SysAreaCode> AreaCodes { get; set; } public ICollection<SysAreaCode> AreaCodes { get; set; }
/// <summary> /// <summary>
/// 多对多中间表（用户-区域 数据范围） /// 多对多中间表（用户-区域 数据范围）