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

src/Hotline.Application/Handlers/FlowEngine/WorkflowNextHandler.cs

@@ -100,7 +100,7 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
 
                 var expiredTimeChanged = false;
                 if (data.FlowDirection.HasValue
-                    && data.External.TimeLimit.HasValue
+                    && data.External.TimeLimit.HasValue                   
                     && data.External.TimeLimitUnit.HasValue)
                 {
                     // 1. calc expiredTime 2. update order.expiredTime 3. update workflow.expiredTime 4. publish province

src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -289,7 +289,7 @@ namespace Hotline.Settings.TimeLimits
                                         minutes += (int)sp.TotalMinutes;
                                     }
                                 }
-                                return minutes == 0 ? 1 : minutes;
+                                return minutes == 0 ? 1 : minutes*60;
                             }
                             //如果不是当天完成
                             else
@@ -313,7 +313,7 @@ namespace Hotline.Settings.TimeLimits
                                             TimeSpan sp = new TimeSpan(endTime.Ticks - WorkBeginTime.Ticks);
                                             minutes += (int)sp.TotalMinutes;
                                         }
-                                        return minutes == 0 ? 1 : minutes;
+                                        return minutes == 0 ? 1 : minutes * 60;
                                     }
                                     else
                                     {