From e75fce6031773dabf64d3ef019189c2362069c45 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 10 八月 2021 17:14:41 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/DTO/AdmAttendanceRuleDTO.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs b/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs
index 9b3c0fb..2db522d 100644
--- a/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs
+++ b/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs
@@ -46,6 +46,10 @@
public string[] rest_s { get; set; }
public string[] rest_e { get; set; }
+
+
+ public string[] jiaban_s { get; set; }
+ public string[] jiaban_e { get; set; }
public List<AdmAttendanceRulesDtlDTO> admAttendanceRulesDtlDTOs { get; set; }
}
@@ -59,8 +63,8 @@
public string Id { get; set; }
public string Pid { get; set; }
- public string ValueStart { get; set; }
- public string ValueEnd { get; set; }
+ public DateTime ValueStart { get; set; }
+ public DateTime ValueEnd { get; set; }
public string Name { get; set; }
public string RecStatus { get; set; }
public string Creater { get; set; }
--
Gitblit v1.9.1