From 16edbbe772e24eb71f6519558576d513e3cf2746 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 9月 2025 15:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/DF22001YiQi

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
index 3c63552..eff2977 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
@@ -117,6 +117,10 @@
         [StringLength(255)]
         public string Remarks { get; set; }
 
+
+        [StringLength(255)]
+        public string MyRemarks { get; set; }
+
         public DateTimeOffset? CreatedTime { get; set; }
 
         public DateTimeOffset? UpdatedTime { get; set; }
@@ -149,5 +153,21 @@
         public string UpdatedUserName { get; set; }
 
         public bool IsDeleted { get; set; }
+
+
+        /// <summary>
+        /// 日志类型
+        /// </summary>
+        public int? PieceLogType { get; set; }
+
+        /// <summary>
+        /// 日志类型
+        /// </summary>
+        [MaxLength(255)]
+        public string PieceLogTypeName { get; set; }
+
+
+        public string JiaJuGongWei { get; set; }
+
     }
 }

--
Gitblit v1.9.3