From 76430b83e28b43122886c1cd8a9fb1cd61040d22 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 28 六月 2021 12:50:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
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