Sfoglia il codice sorgente

Merge branch 'release/yibin' of http://git.12345lm.cn/Fengwo/hotline into release/yibin

Dun.Jason 9 mesi fa
parent
commit
e7aaf38c1c

+ 6 - 5
src/Hotline/FlowEngine/Workflows/Workflow.cs

@@ -35,12 +35,13 @@ public partial class Workflow : CreationEntity
 
     public string? ModuleCode { get; set; }
 
-    #endregion
+	#endregion
 
-    /// <summary>
-    /// 流程标题
-    /// </summary>
-    public string Title { get; set; }
+	/// <summary>
+	/// 流程标题
+	/// </summary>
+	[SugarColumn(ColumnDataType = "varchar(2000)")]
+	public string Title { get; set; }
 
     ///// <summary>
     ///// 到期时间(期满时间)

+ 1 - 1
src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -310,7 +310,7 @@ namespace Hotline.Settings.TimeLimits
                     }
                     else
                     {
-                        if (endTime>WorkEndTime)
+                        if (endTime> WorkEndTime && endTime < WorkBeginTime.AddDays(1))
                         {
                             endTime = WorkBeginTime.AddDays(1);
                         }