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

src/Hotline/Settings/TimeLimitDomain/ExpireTimeSupplier/HourSupplier.cs

@@ -11,6 +11,13 @@ public class HourSupplier : IExpireTimeSupplier, IScopeDependency
 {
     public async Task<TimeResult> CalcEndTimeAsync(DateTime beginTime, TimeConfig timeConfig)
     {
-        return new TimeResult { EndTime = beginTime.AddHours(timeConfig.Count), RuleStr = timeConfig.Count + "个小时", NearlyExpiredTime = beginTime };
+        return new TimeResult
+        {
+            EndTime =
+            beginTime.AddHours(timeConfig.Count),
+            RuleStr = timeConfig.Count + "个小时",
+            NearlyExpiredTime = beginTime.AddHours(timeConfig.Count * ((double)timeConfig.Percentage / 100)),
+            NearlyExpiredTimeOne = beginTime.AddHours(timeConfig.Count * ((double)timeConfig.PercentageOne / 100))
+        };
     }
 }