From 10081828bf4b88b01a63bde072118bfdb582a28e Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 12 九月 2025 19:41:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 MES.Service/Modes/MesStaff.cs |  107 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/MES.Service/Modes/MesStaff.cs b/MES.Service/Modes/MesStaff.cs
index 2d42d2b..17de4b3 100644
--- a/MES.Service/Modes/MesStaff.cs
+++ b/MES.Service/Modes/MesStaff.cs
@@ -9,149 +9,156 @@
 public class MesStaff
 {
     /// <summary>
-    ///     榛樿鍊�: (newid())
-    /// </summary>
+    ///  
+    /// 榛樿鍊�: (newid())
+    ///</summary>
     [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
     public Guid Guid { get; set; }
 
     /// <summary>
-    ///     ID
-    /// </summary>
+    /// ID 
+    ///</summary>
     [SugarColumn(ColumnName = "id")]
-    public decimal Id { get; set; }
+    public decimal? Id { get; set; }
 
     /// <summary>
-    ///     鍛樺伐缂栫爜
-    /// </summary>
+    /// 鍛樺伐缂栫爜 
+    ///</summary>
     [SugarColumn(ColumnName = "staff_no")]
     public string? StaffNo { get; set; }
 
     /// <summary>
-    ///     鍛樺伐濮撳悕
-    /// </summary>
+    /// 鍛樺伐濮撳悕 
+    ///</summary>
     [SugarColumn(ColumnName = "staff_name")]
     public string? StaffName { get; set; }
 
     /// <summary>
-    ///     閮ㄩ棬缂栫爜
-    /// </summary>
+    /// 閮ㄩ棬缂栫爜 
+    ///</summary>
     [SugarColumn(ColumnName = "department_no")]
     public string? DepartmentNo { get; set; }
 
     /// <summary>
-    ///     閮ㄩ棬鍚嶇О
-    /// </summary>
+    /// 閮ㄩ棬鍚嶇О 
+    ///</summary>
     [SugarColumn(ColumnName = "department_name")]
     public string? DepartmentName { get; set; }
 
     /// <summary>
-    ///     宀椾綅缂栫爜
-    /// </summary>
+    /// 宀椾綅缂栫爜 
+    ///</summary>
     [SugarColumn(ColumnName = "position_code")]
     public string? PositionCode { get; set; }
 
     /// <summary>
-    ///     宀椾綅鍚嶇О
-    /// </summary>
+    /// 宀椾綅鍚嶇О 
+    ///</summary>
     [SugarColumn(ColumnName = "position_name")]
     public string? PositionName { get; set; }
 
     /// <summary>
-    ///     鎵嬫満鍙�
-    /// </summary>
+    /// 鎵嬫満鍙� 
+    ///</summary>
     [SugarColumn(ColumnName = "phone_number")]
     public string? PhoneNumber { get; set; }
 
     /// <summary>
-    ///     浠诲矖寮�濮嬫棩鏈�
-    /// </summary>
+    /// 浠诲矖寮�濮嬫棩鏈� 
+    ///</summary>
     [SugarColumn(ColumnName = "start_date")]
     public DateTime? StartDate { get; set; }
 
     /// <summary>
-    ///     澶囨敞
-    /// </summary>
+    /// 澶囨敞 
+    ///</summary>
     [SugarColumn(ColumnName = "remark")]
     public string? Remark { get; set; }
 
     /// <summary>
-    ///     鑷畾涔夊瓧娈�3
-    /// </summary>
+    /// 鑷畾涔夊瓧娈�3 
+    ///</summary>
     [SugarColumn(ColumnName = "remark3")]
     public string? Remark3 { get; set; }
 
     /// <summary>
-    ///     鑷畾涔夊瓧娈�4
-    /// </summary>
+    /// 鑷畾涔夊瓧娈�4 
+    ///</summary>
     [SugarColumn(ColumnName = "remark4")]
     public string? Remark4 { get; set; }
 
     /// <summary>
-    ///     鑷畾涔夊瓧娈�5
-    /// </summary>
+    /// 鑷畾涔夊瓧娈�5 
+    ///</summary>
     [SugarColumn(ColumnName = "remark5")]
     public string? Remark5 { get; set; }
 
     /// <summary>
-    ///     鍒涘缓浜�
-    /// </summary>
+    /// 鍒涘缓浜� 
+    ///</summary>
     [SugarColumn(ColumnName = "create_by")]
     public string? CreateBy { get; set; }
 
     /// <summary>
-    ///     鍒涘缓鏃堕棿
-    /// </summary>
+    /// 鍒涘缓鏃堕棿 
+    ///</summary>
     [SugarColumn(ColumnName = "create_date")]
     public DateTime? CreateDate { get; set; }
 
     /// <summary>
-    ///     鏇存柊浜�
-    /// </summary>
+    /// 鏇存柊浜� 
+    ///</summary>
     [SugarColumn(ColumnName = "lastupdate_by")]
     public string? LastupdateBy { get; set; }
 
     /// <summary>
-    ///     鏇存柊鏃堕棿
-    /// </summary>
+    /// 鏇存柊鏃堕棿 
+    ///</summary>
     [SugarColumn(ColumnName = "lastupdate_date")]
     public DateTime? LastupdateDate { get; set; }
 
     /// <summary>
-    ///     澶囨敞
-    /// </summary>
+    /// 澶囨敞 
+    ///</summary>
     [SugarColumn(ColumnName = "memo")]
     public string? Memo { get; set; }
 
     /// <summary>
-    ///     鐢熶骇绾�
-    /// </summary>
+    /// 鐢熶骇绾� 
+    ///</summary>
     [SugarColumn(ColumnName = "line_no")]
     public string? LineNo { get; set; }
 
     /// <summary>
-    ///     鐢熶骇鍛樺伐鏍囪瘑
-    ///     榛樿鍊�: ((1))
-    /// </summary>
+    /// 鐢熶骇鍛樺伐鏍囪瘑 
+    /// 榛樿鍊�: ((1))
+    ///</summary>
     [SugarColumn(ColumnName = "work_mk")]
     public int? WorkMk { get; set; }
 
     /// <summary>
-    ///     鏄惁绂佺敤
-    /// </summary>
+    /// 鏄惁绂佺敤 
+    ///</summary>
     [SugarColumn(ColumnName = "fforbid_status")]
     public string? FforbidStatus { get; set; }
 
     /// <summary>
-    ///     鍒涘缓缁勭粐
-    /// </summary>
+    /// 鍒涘缓缁勭粐 
+    ///</summary>
     [SugarColumn(ColumnName = "Fumbrella")]
     public string? Fumbrella { get; set; }
 
     /// <summary>
-    ///     浣跨敤缁勭粐
-    /// </summary>
+    /// 浣跨敤缁勭粐 
+    ///</summary>
     [SugarColumn(ColumnName = "FSubsidiary")]
     public string? FSubsidiary { get; set; }
 
+    /// <summary>
+    /// 鍗曟嵁鐘舵�� 
+    ///</summary>
+    [SugarColumn(ColumnName = "DATA_TYPE")]
+    public string? DataType { get; set; }
+
     [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3