From b98c378ed550a9601f5be79d51f44f0fd7baaa85 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 12 Jan 2024 16:02:03 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs       | 6 ------
 Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs            | 5 +++++
 Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs | 8 +++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs b/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs
index 0b518021..f5ccb93b 100644
--- a/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs
@@ -60,12 +60,6 @@ public class CanteenUserEntity : SugarBaseEntity, IVersion, ITenantId
     [SugarColumn(ColumnDescription = "余额(餐补)")]
     public decimal BalanceOfSubsidies { get; set; }
 
-
-    /// <summary>
-    /// 成本中心
-    /// </summary>
-    public string CostId { get; set; }
-
     /// <summary>
     /// 版本号
     /// </summary>
diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
index 1768d42e..961b187e 100644
--- a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
@@ -143,6 +143,11 @@ public class GainfoEntity : SugarBaseEntity
     [SugarColumn(ColumnDescription = "人事范围")]
     public string Werks { get; set; }
 
+    /// <summary>
+    /// 成本中心
+    /// </summary>
+    public string CostId { get; set; }
+
     /// <summary>
     /// 在职状态
     /// </summary>
diff --git a/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs
index 32077607..a34328e8 100644
--- a/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs
+++ b/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs
@@ -76,7 +76,7 @@ public class BalanceRecordEntity : SugarBaseEntity, ITenantId
     /// <summary>
     /// 所属成本日期
     /// </summary>
-    [SugarColumn(ColumnDescription = "所属成本日期")]
+    [SugarColumn(ColumnDataType = "date", ColumnDescription = "所属成本日期")]
     public DateTime CostDate { get; set; }
 
     /// <summary>
@@ -121,5 +121,11 @@ public class BalanceRecordEntity : SugarBaseEntity, ITenantId
     [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "数据状态")]
     public BalanceRecordStatusEnumType Status { get; set; }
 
+    /// <summary>
+    /// 消费时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "消费时间")]
+    public DateTime CostDateTime { get; set; }
+
     public string TenantId { get; set; }
 }
\ No newline at end of file