From 2ccb8c94fcfe6891b6db60995e83cd7b54e389a6 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期日, 29 九月 2024 17:33:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/cylsg
---
cylsg/cylsg.Model/OrderModel/Order.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/cylsg/cylsg.Model/OrderModel/Order.cs b/cylsg/cylsg.Model/OrderModel/Order.cs
index b76a4e7..d901ab2 100644
--- a/cylsg/cylsg.Model/OrderModel/Order.cs
+++ b/cylsg/cylsg.Model/OrderModel/Order.cs
@@ -37,18 +37,33 @@
public string OrderName { get; set; }
/// <summary>
+ /// 宸ヤ綔寮�濮嬫棩鏈�
+ /// </summary>
+ [Display(Name = "宸ヤ綔寮�濮嬫棩鏈�")]
+ [SugarColumn(ColumnDescription = "宸ヤ綔寮�濮嬫棩鏈�", IsNullable = true)]
+ public DateTime? WordStartTime { get; set; }
+
+ /// <summary>
+ /// 宸ヤ綔缁撴潫鏃堕棿
+ /// </summary>
+ [Display(Name = "宸ヤ綔缁撴潫鏃ユ湡")]
+ [SugarColumn(ColumnDescription = "宸ヤ綔缁撴潫鏃ユ湡", IsNullable = true)]
+ public DateTime? WordEndTime { get; set; }
+
+
+ /// <summary>
/// 宸ヤ綔寮�濮嬫椂闂�
/// </summary>
[Display(Name = "宸ヤ綔寮�濮嬫椂闂�")]
[SugarColumn(ColumnDescription = "宸ヤ綔寮�濮嬫椂闂�", IsNullable = true)]
- public DateTime? WordStartTime { get; set; }
+ public DateTime? StartTime { get; set; }
/// <summary>
/// 宸ヤ綔缁撴潫鏃堕棿
/// </summary>
[Display(Name = "宸ヤ綔缁撴潫鏃堕棿")]
[SugarColumn(ColumnDescription = "宸ヤ綔缁撴潫鏃堕棿", IsNullable = true)]
- public DateTime? WordEndTime { get; set; }
+ public DateTime? EndTime { get; set; }
/// <summary>
/// 闇�姹�
@@ -80,7 +95,7 @@
/// 宸ヤ綔鏂瑰紡
/// </summary>
[SugarColumn(ColumnDescription = "宸ヤ綔鏂瑰紡", IsNullable = true)]
- public WorkerTypes? WorkerType { get; set; }
+ public int? WorkerType { get; set; }
/// <summary>
@@ -94,7 +109,7 @@
/// 鎷涘伐鐘舵��
/// </summary>
[SugarColumn(ColumnDescription = "鎷涘伐鐘舵��", IsNullable = true)]
- public OrderStatuses? OrderStatus { get; set; }
+ public int? OrderStatus { get; set; }
}
--
Gitblit v1.9.1