merge conflict

src/Hotline.Application/Orders/OrderApplication.cs

@@ -465,7 +465,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 			.WhereIF(dto.Level == 1,(x,ws)=> ws.AcceptorOrgId == _sessionContext.OrgId)
             .WhereIF(dto.Level == 2, (x, ws) => ws.AcceptorOrgId.StartsWith(_sessionContext.OrgId))
             .WhereIF(dto.Signed == 0 ,(x,ws)=>ws.Status == Share.Enums.FlowEngine.EWorkflowStepStatus.WaitForAccept)
-            .WhereIF(dto.Signed == 1, (x, ws) => ws.Status != Share.Enums.FlowEngine.EWorkflowStepStatus.WaitForAccept)
+            .WhereIF(dto.Signed == 1, (x, ws) => ws.Status == Share.Enums.FlowEngine.EWorkflowStepStatus.WaitForHandle)
 			.OrderByDescending((x,ws) => ws.CreationTime);
 	}
 

src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -211,7 +211,7 @@ namespace Hotline.Settings.TimeLimits
 				        ////总时差分钟数
 				        //int minutes = (int)minuteSpan.TotalMinutes;
 
-				        return Math.Round((decimal)min / 60 , 2);
+				        return Math.Round((decimal)min / 60 / 60 , 2);
 			        }
 			        return 0;
 		        }