diff --git a/Models/budget/budget_expenditure_report_from_revenue.cs b/Models/budget/budget_expenditure_report_from_revenue.cs index 6304972..06bcceb 100644 --- a/Models/budget/budget_expenditure_report_from_revenue.cs +++ b/Models/budget/budget_expenditure_report_from_revenue.cs @@ -41,7 +41,7 @@ namespace rmutr_report.Models public class budget_personnel_list_2 //ค่าจ้างชั่วคราว { - public string list { get; set; } + public string topic { get; set; } public decimal? rate { get; set; } public decimal? total { get; set; } public List budget_rates { get; set; } @@ -49,7 +49,7 @@ namespace rmutr_report.Models public class budget_rate //อัตราเดิม/อัตราใหม่ { - public string list { get; set; } + public string topic { get; set; } public decimal? rate { get; set; } public decimal? total { get; set; } public List details { get; set; } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index d05f379..7afbd2e 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 5b0150e..19d715c 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index d05f379..7afbd2e 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 5b0150e..19d715c 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue.frx b/wwwroot/reports/budget_expenditure_report_from_revenue.frx index b1a0b9a..c3124b8 100644 --- a/wwwroot/reports/budget_expenditure_report_from_revenue.frx +++ b/wwwroot/reports/budget_expenditure_report_from_revenue.frx @@ -1,5 +1,5 @@  - + @@ -15,11 +15,11 @@ - + - + @@ -73,14 +73,14 @@ - + - +