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/DTO/AdmAttendanceDtlDTO.cs | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/zhengcaioa/DTO/AdmAttendanceDtlDTO.cs b/zhengcaioa/DTO/AdmAttendanceDtlDTO.cs index 3bbc9e9..6fa5774 100644 --- a/zhengcaioa/DTO/AdmAttendanceDtlDTO.cs +++ b/zhengcaioa/DTO/AdmAttendanceDtlDTO.cs @@ -22,9 +22,12 @@ public DateTime Createtime { get; set; } public string Modifier { get; set; } public DateTime Modifytime { get; set; } - public decimal Chidaofenzhong { get; set; } - public decimal Zaotuifenzhong { get; set; } + public decimal Shangwuchidaofenzhong { get; set; } + public decimal Xiawuchidaofenzhong { get; set; } + public decimal Shangwuzaotuifenzhong { get; set; } + public decimal Xiawuzaotuifenzhong { get; set; } public decimal Kuanggongtianshu { get; set; } + public string Iswork { get; set; } } public class AdmAttendanceDtlDTOSearch : SearchEntity -- Gitblit v1.9.1