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

---
 iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs
index 6fd9956..c6a38a6 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs
@@ -62,12 +62,16 @@
 
 
 
-        [Description("澶囨敞")]
-        public string Remarks { get; set; }
+        //[Description("澶囨敞")]
+        //public string Remarks { get; set; }
 
 
 
-        [Description("鍒涘缓浜�")]
+        [Description("鏉ユ簮")]
+        public string DataCapturePointCname { get; set; }
+
+
+        [Description("鏉ユ簮浠g爜")]
         public virtual string CreatedUserName { get; set; }
 
         /// <summary>
@@ -75,8 +79,6 @@
         /// </summary>
         [Description("鍒涘缓鏃堕棿")]
         public virtual DateTimeOffset? CreatedTime { get; set; }
-
-
 
 
 

--
Gitblit v1.9.3