Merge branch 'develop' into working

This commit is contained in:
Suphonchai Phoonsawat 2023-08-07 16:21:51 +07:00
commit 2635f47a62
6 changed files with 25519 additions and 20 deletions

View file

@ -35,10 +35,10 @@ namespace BMA.EHR.Domain.Models.Organizations
public OrganizationEntity? Parent { get; set; }
[Column(Order = 10), Comment("OrganizationAgencyId")]
public OrganizationAgency? OrganizationAgency { get; set; }
public Guid? OrganizationAgencyId { get; set; }
[Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
public OrganizationGovernmentAgency? OrganizationGovernmentAgency { get; set; }
public Guid? OrganizationGovernmentAgencyId { get; set; }
[Column(Order = 12), Comment("OrganizationOrder")]
public int? OrganizationOrder { get; set; }