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
/// 班次查询对象
///
public class GroupShiftQueryDto : PagerInfo
- {
- }
+ {}
///
/// 班次输入输出对象
@@ -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
///
public string Name { get; set; }
+
+ ///
+ /// 工时
+ ///
+ public decimal WorkHours { get; set; }
+
+
///
/// 开始时间
///
@@ -62,6 +69,5 @@ namespace DOAN.Model.MES.group
///
[SugarColumn(ColumnName = "uPDATED_TIME")]
public DateTime? UpdatedTime { get; set; }
-
}
}
\ No newline at end of file