合并测试

OASystem/PaymentSystem.Domain/Entities/EntityBase.cs

@@ -11,11 +11,6 @@
         [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true, IsIdentity = true)]
         public int Id { get; set; }
         /// <summary>
-        /// 是否删除
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否删除")]
-        public bool IsDeleted { get; set; }
-        /// <summary>
         /// 创建者Id
         /// </summary>
         [SugarColumn(ColumnDescription = "创建者Id", IsNullable = true)]
@@ -25,6 +20,12 @@
         /// </summary>
         [SugarColumn(ColumnDescription = "创建时间")]
         public DateTime CreateTime { get; set; } = DateTime.Now;
+       
+        /// <summary>
+        /// 是否删除
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否删除")]
+        public bool IsDel { get; set; }
         /// <summary>
         /// 删除者Id
         /// </summary>
@@ -34,7 +35,7 @@
         /// 删除时间
         /// </summary>
         [SugarColumn(ColumnDescription = "删除时间")]
-        public DateTime DeleteTime { get; set; }
+        public string DeleteTime { get; set; }
     }
 
 }