From da84e4e72c9d9cc7e2bd40dc4bb7b3222ca3519a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 28 四月 2026 17:07:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Models/基础资料/Gy_Employee.cs | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee.cs"
index 846728b..facffff 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee.cs"
@@ -39,8 +39,8 @@
public long HProcID { get; set; }
public string HBasePay { get; set; }
- public DateTime HInComDate { get; set; }
- public DateTime HDimissionDate { get; set; }
+ public DateTime? HInComDate { get; set; }
+ public DateTime? HDimissionDate { get; set; }
public bool HOverType { get; set; }
public string HEmpType { get; set; }
public string HOtherDeduct3 { get; set; }
@@ -49,23 +49,23 @@
public string HMedicare { get; set; }
public bool HNoBrushFlag { get; set; }
public bool HShiftFlag { get; set; }
- public DateTime HContactDate { get; set; }
+ public DateTime? HContactDate { get; set; }
public bool HStopwagesFlag { get; set; }
public string HDimissionReason { get; set; }
public long HDormID { get; set; }
public string HArchivesNo { get; set; }
- public DateTime HStayCardEDate { get; set; }
- public DateTime HCheckCardEDate { get; set; }
+ public DateTime? HStayCardEDate { get; set; }
+ public DateTime? HCheckCardEDate { get; set; }
public string HJobCardNo { get; set; }
- public DateTime HJobCardEDate { get; set; }
+ public DateTime? HJobCardEDate { get; set; }
public string HWorkType { get; set; }
public long HContractYear { get; set; }
- public DateTime HContractBDate { get; set; }
- public DateTime HContractEDate { get; set; }
+ public DateTime? HContractBDate { get; set; }
+ public DateTime? HContractEDate { get; set; }
public string HInsuranceNo { get; set; }
- public DateTime HInsuranceDate { get; set; }
+ public DateTime? HInsuranceDate { get; set; }
public bool HInsuranceStatus { get; set; }
- public DateTime HSignDate { get; set; }
+ public DateTime? HSignDate { get; set; }
public bool HSignStatus { get; set; }
public string HOldCompany { get; set; }
public string HMarr { get; set; }
@@ -74,7 +74,7 @@
public string HSpec { get; set; }
public string HCompLev { get; set; }
public string HEngLev { get; set; }
- public DateTime HGradDate { get; set; }
+ public DateTime? HGradDate { get; set; }
public string HGradSchool { get; set; }
public string HSalaryLev { get; set; }
public long HDutyID { get; set; }
@@ -100,9 +100,10 @@
public string HStdDayPay { get; set; }
public string HMinDayPay { get; set; }
public string HMinMonthPay { get; set; }
- public DateTime HMadeDate { get; set; }
+ public DateTime? HMadeDate { get; set; }
public string HEmpRate { get; set; }
public string HExamRate { get; set; }
- public DateTime HHealthCardEDate { get; set; }
+ public DateTime? HHealthCardEDate { get; set; }
+ public long HUSEORGID { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.1