Merge branch 'development'

This commit is contained in:
2024-03-19 12:41:18 +08:00
2 changed files with 3 additions and 1 deletions

View File

@@ -279,6 +279,7 @@ public class DevicePermissionService : IDevicePermissionService
Status = DeviceTaskStatusEnumType.Wait,
Type = taskType,
UserNo = userNo,
CancellationId = 0,
Version = 0,
}).ToList();

View File

@@ -50,7 +50,8 @@ public class DeviceTaskEntity : SugarBaseEntity, ITenantId, IVersion
/// <summary>
/// 取消id
/// </summary>
public long CancellationId { get; set; }
[SugarColumn(DefaultValue = "0")]
public long CancellationId { get; set; } = 0;
public string TenantId { get; set; }