Merge branch 'develop' into working
This commit is contained in:
commit
f80c1ca295
5 changed files with 12804 additions and 4 deletions
|
|
@ -34,11 +34,11 @@ namespace BMA.EHR.Domain.Models.Organizations
|
|||
[Column(Order = 9), Comment("ParentId")]
|
||||
public OrganizationEntity? Parent { get; set; }
|
||||
|
||||
// [Column(Order = 10), Comment("OrganizationAgencyId")]
|
||||
// public OrganizationAgency? OrganizationAgency { get; set; }
|
||||
[Column(Order = 10), Comment("OrganizationAgencyId")]
|
||||
public OrganizationAgency? OrganizationAgency { get; set; }
|
||||
|
||||
// [Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
|
||||
// public OrganizationGovernmentAgency? OrganizationGovernmentAgency { get; set; }
|
||||
[Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
|
||||
public OrganizationGovernmentAgency? OrganizationGovernmentAgency { get; set; }
|
||||
|
||||
[Column(Order = 12), Comment("OrganizationOrder")]
|
||||
public int? OrganizationOrder { get; set; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue