Merge branch 'development'
This commit is contained in:
@@ -279,6 +279,7 @@ public class DevicePermissionService : IDevicePermissionService
|
|||||||
Status = DeviceTaskStatusEnumType.Wait,
|
Status = DeviceTaskStatusEnumType.Wait,
|
||||||
Type = taskType,
|
Type = taskType,
|
||||||
UserNo = userNo,
|
UserNo = userNo,
|
||||||
|
CancellationId = 0,
|
||||||
Version = 0,
|
Version = 0,
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
|
||||||
|
|||||||
@@ -50,7 +50,8 @@ public class DeviceTaskEntity : SugarBaseEntity, ITenantId, IVersion
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 取消id
|
/// 取消id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public long CancellationId { get; set; }
|
[SugarColumn(DefaultValue = "0")]
|
||||||
|
public long CancellationId { get; set; } = 0;
|
||||||
|
|
||||||
|
|
||||||
public string TenantId { get; set; }
|
public string TenantId { get; set; }
|
||||||
|
|||||||
Reference in New Issue
Block a user