解决冲突

Model/Entity/BaseEntity.cs

@@ -18,10 +18,10 @@ namespace Model.Entity
         /// <summary>
         /// 删除状态
         /// </summary>
-        [SugarColumn(ColumnName = "IsDel", ColumnDescription = "删除状态（0、未删除；1、已删除）", ColumnDataType = "tinyint", DefaultValue = "0", CreateTableFieldSort = 106)]
+        [SugarColumn(ColumnName = "IsDel", ColumnDescription = "删除状态（0、未删除；1、已删除）", ColumnDataType = "smallint", DefaultValue = "0", CreateTableFieldSort = 106)]
         public virtual byte IsDel { get; set; }
 
         [SugarColumn(ColumnName = "CreateTime")]
-        public DateTime CreateTime { get; set; }
+        public virtual DateTime? CreateTime { get; set; }
     }
 }

Model/Entity/TemperatureBoxDataEntity.cs

@@ -0,0 +1,54 @@
+using SqlSugar;
+using System;
+
+namespace Model.Entity
+{
+    /// <summary>
+    /// 温度箱看板数据实体
+    /// 室内环境温湿度曲线；设备温度、湿度、状态等指标；设备告警信息
+    /// </summary>
+    public class TemperatureBoxDataEntity : BaseEntity
+    {
+        /// <summary>
+        /// 设备标识
+        /// </summary>
+        [SugarColumn(ColumnName = "DeviceCode", ColumnDescription = "设备标识", ColumnDataType = "varchar(64)")]
+        public string DeviceCode { get; set; }
+
+        /// <summary>
+        /// 设备类型
+        /// </summary>
+        [SugarColumn(ColumnName = "DeviceType", ColumnDescription = "设备类型", ColumnDataType = "varchar(64)")]
+        public string DeviceType { get; set; }
+
+        /// <summary>
+        /// 设备温度（℃）
+        /// </summary>
+        [SugarColumn(ColumnName = "DeviceTemperature", ColumnDescription = "设备温度(℃)", IsNullable = true)]
+        public double? DeviceTemperature { get; set; }
+
+        /// <summary>
+        /// 设备湿度（%）
+        /// </summary>
+        [SugarColumn(ColumnName = "DeviceHumidity", ColumnDescription = "设备湿度(%)", IsNullable = true)]
+        public double? DeviceHumidity { get; set; }
+
+        /// <summary>
+        /// 设备状态
+        /// </summary>
+        [SugarColumn(ColumnName = "Status", ColumnDescription = "设备状态", ColumnDataType = "varchar(32)", IsNullable = true)]
+        public string Status { get; set; }
+
+        /// <summary>
+        /// 设备告警信息
+        /// </summary>
+        [SugarColumn(ColumnName = "AlarmInfo", ColumnDescription = "设备告警信息", IsNullable = true)]
+        public string AlarmInfo { get; set; }
+
+        /// <summary>
+        /// 采集时间（用于绘制温湿度曲线）
+        /// </summary>
+        [SugarColumn(ColumnName = "CreateTime", ColumnDescription = "采集时间", IsNullable = true)]
+        public override DateTime? CreateTime { get; set; }
+    }
+}