diff --git a/common.props b/common.props index 39a1dd9..c074a72 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 1.0.0-preview.1 + 1.0.0-preview.2 $(NoWarn);CS1591;CS0436 module true diff --git a/src/EasyAbp.ProcessManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateEto.cs b/src/EasyAbp.ProcessManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateEto.cs index 641899c..2c747df 100644 --- a/src/EasyAbp.ProcessManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateEto.cs +++ b/src/EasyAbp.ProcessManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateEto.cs @@ -1,4 +1,5 @@ using System; +using Volo.Abp; using Volo.Abp.MultiTenancy; namespace EasyAbp.ProcessManagement.Processes; @@ -8,14 +9,17 @@ public class UpdateProcessStateEto : UpdateProcessStateModel, IMultiTenant { public Guid? TenantId { get; set; } + public string CorrelationId { get; set; } + public UpdateProcessStateEto() { } public UpdateProcessStateEto(Guid? tenantId, string correlationId, string? actionName, ProcessStateFlag stateFlag, string? stateSummaryText, DateTime stateUpdateTime, string stateName, string? stateDetailsText) : base( - correlationId, actionName, stateFlag, stateSummaryText, stateUpdateTime, stateName, stateDetailsText) + actionName, stateFlag, stateSummaryText, stateUpdateTime, stateName, stateDetailsText) { TenantId = tenantId; + CorrelationId = Check.NotNullOrWhiteSpace(correlationId, nameof(correlationId)); } } \ No newline at end of file diff --git a/src/EasyAbp.ProcessManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateModel.cs b/src/EasyAbp.ProcessManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateModel.cs index c20b60e..6880c06 100644 --- a/src/EasyAbp.ProcessManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateModel.cs +++ b/src/EasyAbp.ProcessManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateModel.cs @@ -7,8 +7,6 @@ namespace EasyAbp.ProcessManagement.Processes; [Serializable] public class UpdateProcessStateModel : ExtensibleObject, IProcessState { - public string CorrelationId { get; set; } - public string? ActionName { get; set; } public ProcessStateFlag StateFlag { get; set; } @@ -25,10 +23,9 @@ public UpdateProcessStateModel() { } - public UpdateProcessStateModel(string correlationId, string? actionName, ProcessStateFlag stateFlag, - string? stateSummaryText, DateTime stateUpdateTime, string stateName, string? stateDetailsText) + public UpdateProcessStateModel(string? actionName, ProcessStateFlag stateFlag, string? stateSummaryText, + DateTime stateUpdateTime, string stateName, string? stateDetailsText) { - CorrelationId = Check.NotNullOrWhiteSpace(correlationId, nameof(correlationId)); ActionName = actionName; StateFlag = stateFlag; StateSummaryText = stateSummaryText;