From 3262eb334953a1b208aa4a50584442a3804912d9 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期日, 27 六月 2021 13:09:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

---
 zhengcaioa/Model/AdmAttendanceDtl.cs |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/zhengcaioa/Model/AdmAttendanceDtl.cs b/zhengcaioa/Model/AdmAttendanceDtl.cs
index 1cb2d45..9804a04 100644
--- a/zhengcaioa/Model/AdmAttendanceDtl.cs
+++ b/zhengcaioa/Model/AdmAttendanceDtl.cs
@@ -23,8 +23,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; }
     }
 }

--
Gitblit v1.9.1