From bef853fc5adf095c54415e7fc23574655ac0859a Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 17:06:28 +0800
Subject: [PATCH] 预发工资计算逻辑调整
---
zhengcaioa/Model/HrSalary.cs | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Model/HrSalary.cs b/zhengcaioa/Model/HrSalary.cs
index b0bce30..ec1124e 100644
--- a/zhengcaioa/Model/HrSalary.cs
+++ b/zhengcaioa/Model/HrSalary.cs
@@ -49,11 +49,15 @@
public class HrSalaryAppeal
{
[Key]
- public int id { get; set; }
+ public string id { get; set; }
- public string salary_id { get; set; }
+ public string salary_id { get; set; }
public string reason { get; set; }
+
+ public int year { get; set; }
+
+ public int month { get; set; }
public decimal amount { get; set; }
@@ -70,5 +74,19 @@
public string chk_result { get; set; }
public string status { get; set; }
+
+ public string createrName { get; set; }
+ public string tittle { get; set; }
+ public string shenpi_status { get; set; }
+ }
+
+ public class HrSalaryAppealDTO : HrSalaryAppeal
+ {
+ public string Step { get; set; }
+
+ public string Tongguojujue { get; set; }
+
+ public string Content { get; set; }
+
}
}
--
Gitblit v1.9.1