Merge branch 'develop' into working

This commit is contained in:
Suphonchai Phoonsawat 2023-07-16 20:01:41 +07:00
commit 7bbee29005

View file

@ -56,11 +56,11 @@ namespace BMA.EHR.Organization.Service.Models
[Column(Order = 9), Comment("ParentId")]
public Guid? ParentId { get; set; }
[Column(Order = 10), Comment("OrganizationAgencyId")]
public Guid? OrganizationAgencyId { get; set; }
// [Column(Order = 10), Comment("OrganizationAgencyId")]
// public Guid? OrganizationAgencyId { get; set; }
[Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
public Guid? OrganizationGovernmentAgencyId { get; set; }
// [Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
// public Guid? OrganizationGovernmentAgencyId { get; set; }
[Column(Order = 12), Comment("OrganizationOrder")]
public int? OrganizationOrder { get; set; }