From 4125c2adc39ed2e6407c8d82b6680e06d3b6602b Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 26 Nov 2024 08:48:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Model/MES/group/Dto/GroupShiftDto.cs | 10 ++--------
 DOAN.Model/MES/group/GroupShift.cs        |  8 +++++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/DOAN.Model/MES/group/Dto/GroupShiftDto.cs b/DOAN.Model/MES/group/Dto/GroupShiftDto.cs
index 1bf70a4..15b507e 100644
--- a/DOAN.Model/MES/group/Dto/GroupShiftDto.cs
+++ b/DOAN.Model/MES/group/Dto/GroupShiftDto.cs
@@ -6,8 +6,7 @@ namespace DOAN.Model.MES.group.Dto
     /// 班次查询对象
     /// </summary>
     public class GroupShiftQueryDto : PagerInfo 
-    {
-    }
+    {}
 
     /// <summary>
     /// 班次输入输出对象
@@ -19,6 +18,7 @@ namespace DOAN.Model.MES.group.Dto
 
         public string Name { get; set; }
 
+        public decimal WorkHours { get; set; }
         public DateTime? StartTime { get; set; }
 
         public DateTime? EndTime { get; set; }
@@ -34,9 +34,6 @@ namespace DOAN.Model.MES.group.Dto
         public string UpdatedBy { get; set; }
 
         public DateTime? UpdatedTime { get; set; }
-
-
-
     }
     public class GroupShiftDto2
     {
@@ -60,8 +57,5 @@ namespace DOAN.Model.MES.group.Dto
         public string UpdatedBy { get; set; }
 
         public DateTime? UpdatedTime { get; set; }
-
-
-
     }
 }
\ No newline at end of file
diff --git a/DOAN.Model/MES/group/GroupShift.cs b/DOAN.Model/MES/group/GroupShift.cs
index 18fb0de..654bcec 100644
--- a/DOAN.Model/MES/group/GroupShift.cs
+++ b/DOAN.Model/MES/group/GroupShift.cs
@@ -17,6 +17,13 @@ namespace DOAN.Model.MES.group
         /// </summary>
         public string Name { get; set; }
 
+
+        /// <summary>
+        /// 工时
+        /// </summary>
+        public decimal WorkHours { get; set; }
+
+
         /// <summary>
         /// 开始时间 
         /// </summary>
@@ -62,6 +69,5 @@ namespace DOAN.Model.MES.group
         /// </summary>
         [SugarColumn(ColumnName = "uPDATED_TIME")]
         public DateTime? UpdatedTime { get; set; }
-
     }
 }
\ No newline at end of file