Merge branch 'develop' into working

2023-09-04 14:55:52 +07:00 · 2023-09-04 14:55:52 +07:00 · 2021d77695
commit 2021d77695
parent d016d03bab ee884f9434
6 changed files with 16352 additions and 10 deletions
--- a/BMA.EHR.Domain/Models/HR/Profile.cs
+++ b/BMA.EHR.Domain/Models/HR/Profile.cs
@ -264,7 +264,7 @@ namespace BMA.EHR.Domain.Models.HR
        [Comment("สังกัด")]
        public string? EmployeeOc { get; set; }
        [Comment("ค่าจ้าง")]
-        public string? EmployeeWage { get; set; }
+        public double? EmployeeWage { get; set; }
        [Comment("ประเภทบุคคล")]
        public string? EmployeeTypeIndividual { get; set; }
        [Comment("เงินเพิ่มการครองชีพชั่วคราว")]