Merge branch 'develop' into working

This commit is contained in:
Suphonchai Phoonsawat 2023-07-16 20:08:57 +07:00
commit d8031bff98

View file

@ -56,8 +56,8 @@ namespace BMA.EHR.Organization.Service.Models
[Column(Order = 11), Comment("PositionCondition")] [Column(Order = 11), Comment("PositionCondition")]
public string? PositionCondition { get; set; } public string? PositionCondition { get; set; }
[Column(Order = 12), Comment("PositionStatus")] // [Column(Order = 12), Comment("PositionStatus")]
public Guid? PositionStatus { get; set; } // public Guid? PositionStatus { get; set; }
[Column(Order = 13), Comment("PositionMasterUserNote")] [Column(Order = 13), Comment("PositionMasterUserNote")]
public string? PositionMasterUserNote { get; set; } public string? PositionMasterUserNote { get; set; }