Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/TemplateDomainController.cs

@@ -68,8 +68,6 @@ namespace Hotline.Api.Controllers
 
             _mapper.Map(dto,model);
 
-
-
             Regex regex = new(@"\{[a-zA-Z0-9]{1,}\}");
             var matches = regex.Matches(model.Content);
             List<string> list = new List<string>();
@@ -84,8 +82,6 @@ namespace Hotline.Api.Controllers
             await _messageTemplateRepository.UpdateAsync(model, HttpContext.RequestAborted);
         }
 
-
-
         /// <summary>
         /// 查询详情
         /// </summary>

src/XF.Domain.Repository/Entity.cs

@@ -157,13 +157,13 @@ public abstract class WorkflowEntity : FullStateEntity, IWorkflow
     /// 办理人id
     /// </summary>
     [SugarColumn(ColumnDataType = "json", IsJson = true)]
-    public List<HandlerGroupItem> HandlerUsers { get; set; } = new();
+    public List<HandlerGroupItem>? HandlerUsers { get; set; } = new();
 
     /// <summary>
     /// 办理部门id
     /// </summary>
     [SugarColumn(ColumnDataType = "json", IsJson = true)]
-    public List<HandlerGroupItem> HandlerOrgs { get; set; } = new();
+    public List<HandlerGroupItem>? HandlerOrgs { get; set; } = new();
 
     #endregion
 
@@ -333,13 +333,13 @@ public abstract class PositionWorkflowEntity : PositionEntity, IWorkflow
     /// 办理人id
     /// </summary>
     [SugarColumn(ColumnDataType = "json", IsJson = true)]
-    public List<HandlerGroupItem> HandlerUsers { get; set; } = new();
+    public List<HandlerGroupItem>? HandlerUsers { get; set; } = new();
 
     /// <summary>
     /// 办理部门id
     /// </summary>
     [SugarColumn(ColumnDataType = "json", IsJson = true)]
-    public List<HandlerGroupItem> HandlerOrgs { get; set; } = new();
+    public List<HandlerGroupItem>? HandlerOrgs { get; set; } = new();
 
     #endregion