From 56e5ef90ee97e296014b4faf6863315ad0c2ace4 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期四, 10 六月 2021 19:08:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/DTO/AdmSignInDTO.cs | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/DTO/AdmSignInDTO.cs b/zhengcaioa/DTO/AdmSignInDTO.cs
index 9e5da0d..0bfbb4d 100644
--- a/zhengcaioa/DTO/AdmSignInDTO.cs
+++ b/zhengcaioa/DTO/AdmSignInDTO.cs
@@ -59,16 +59,27 @@
public string Id { get; set; }
public string SigninId { get; set; }
public string Lavetype { get; set; }
- public DateTime StratTime { get; set; }
- public DateTime EndTime { get; set; }
- public int LaveDay { get; set; }
- public int LavehHour { get; set; }
+ public DateTime? StratTime { get; set; }
+ public string StratTimeName { get; set; }
+ public string StratPoint { get; set; }
+ public DateTime? EndTime { get; set; }
+ public string EndTimeName { get; set; }
+ public string EndPoint { get; set; }
+ public int? LaveDay { get; set; }
+ public int? LavehHour { get; set; }
public string Remark { get; set; }
+ public string ShenpiStatus { get; set; }
public string RecStatus { get; set; }
public string Creater { get; set; }
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
public DateTime Modifytime { get; set; }
+ public string[] attachmentid { get; set; }
+ public string[] Filepath { get; set; }
+ public string[] Filefullname { get; set; }
+
+ public string CreaterName { get; set; }
+ public string Tittle { get; set; }
}
@@ -80,9 +91,14 @@
public string Id { get; set; }
public string SigninId { get; set; }
public string Lavetype { get; set; }
- public DateTime StratTime { get; set; }
- public DateTime EndTime { get; set; }
+ public DateTime? StratTime { get; set; }
+ public string StratTimeName { get; set; }
+ public string StratPoint { get; set; }
+ public DateTime? EndTime { get; set; }
+ public string EndTimeName { get; set; }
+ public string EndPoint { get; set; }
public string MedicalRecord { get; set; }
+ public string ShenpiStatus { get; set; }
public string Remark { get; set; }
public string RecStatus { get; set; }
public string Creater { get; set; }
@@ -92,5 +108,9 @@
public string[] attachmentid { get; set; }
public string[] Filepath { get; set; }
public string[] Filefullname { get; set; }
+
+ public string CreaterName { get; set; }
+ public string Tittle { get; set; }
+
}
}
--
Gitblit v1.9.1