ปรับปรุงตามได้รับแจ้ง

This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-09-14 18:25:36 +07:00
parent e201075167
commit 3016221910
2 changed files with 6 additions and 2 deletions

View File

@@ -134,8 +134,7 @@ namespace TodoAPI2.Models
total_salary = m_eva_limit_frame_group.total_salary,
total_salary_limit = m_eva_limit_frame_group.total_salary_limit,
total_salary_limit_rounded = m_eva_limit_frame_group.total_salary_limit_rounded,
remark = m_eva_limit_frame_group.remark+@"
"+ m_eva_limit_frame_group.remark2,
remark = !string.IsNullOrEmpty(m_eva_limit_frame_group.remark2) ? m_eva_limit_frame_group.remark2 : m_eva_limit_frame_group.remark,
remark2 = m_eva_limit_frame_group.remark2,
frame_plan_guid_eva_limit_frame_plan_executed_date = fk_eva_limit_frame_planResult1.executed_date,