Merge branch 'develop' into work

2023-08-08 11:05:04 +07:00 · 2023-08-08 11:05:04 +07:00 · 4bb0af5404
commit 4bb0af5404
parent ed52581e58 aff4dcd38d
7 changed files with 12936 additions and 21 deletions
--- a/BMA.EHR.Domain/Models/HR/ProfileSalary.cs
+++ b/BMA.EHR.Domain/Models/HR/ProfileSalary.cs
@ -49,9 +49,16 @@ namespace BMA.EHR.Domain.Models.HR

        [Comment("ตำแหน่ง (รายละเอียด)")]
        public string? SalaryClass { get; set; }
+
        [Comment("เอกสารอ้างอิง")]
        public string? SalaryRef { get; set; }
        public virtual List<ProfileSalaryHistory> ProfileSalaryHistorys { get; set; } = new List<ProfileSalaryHistory>();
        public virtual Profile? Profile { get; set; }
+
+        [Comment("เลขที่คำสั่ง")]
+        public string CommandNo { get; set; }
+
+        [Comment("ประเภทคำสั่ง")]
+        public string CommandTypeName { get; set; }
    }
 }