From 072169e3c5446f94e2cf4e570e5c7952bb5b15b9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 七月 2021 14:47:44 +0800
Subject: [PATCH] 今日开发 考勤规则里增加 公司安排加班 调整请假时间计算 加班日考勤计算
---
zhengcaioa/Model/HrSalary.cs | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Model/HrSalary.cs b/zhengcaioa/Model/HrSalary.cs
index b0bce30..f0fd961 100644
--- a/zhengcaioa/Model/HrSalary.cs
+++ b/zhengcaioa/Model/HrSalary.cs
@@ -49,9 +49,13 @@
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 int Year { get; set; }
+
+ public int Month { get; set; }
public string reason { get; set; }
@@ -70,5 +74,22 @@
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