From 1dcc7b63a20daad7c7060f18878d8e8dbaad02de Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期一, 28 四月 2025 16:41:31 +0800
Subject: [PATCH] 解决冲突
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs"
index 2132478..c126ce6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs"
@@ -33,7 +33,7 @@
/// 鏄惁鍙互妫�淇�
/// </summary>
[SugarColumn( IsNullable = true, ColumnDescription = "鏄惁鍙互妫�淇�")]
- public bool IsPossible { get; set; }
+ public string IsPossible { get; set; }
/// <summary>
/// 妫�淇姸鎬�
@@ -45,13 +45,13 @@
/// 妫�淇紑濮嬫椂闂�
/// </summary>
[SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "妫�淇紑濮嬫椂闂�")]
- public DateTime MaintenancStartTime { get; set; }
+ public DateTime? MaintenancStartTime { get; set; }
// <summary>
/// 妫�淇粨鏉熸椂闂�
/// </summary>
[SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "妫�淇粨鏉熸椂闂�")]
- public DateTime MaintenancEendTime { get; set; }
+ public DateTime? MaintenancEendTime { get; set; }
--
Gitblit v1.9.3