Merge branch 'release' of http://110.188.24.182:10023/Fengwo/hotline into release

src/Hotline/Settings/TimeLimitDomain/ExpireTimeHandler.cs

@@ -126,7 +126,7 @@ public class ExpireTimeHandler : IExpireTimeHandler, IScopeDependency
                 {
                     i++;
                     //如果是工作日
-                    if (await NotWorkDay(beginTime))
+                    if (await IsWorkDay(beginTime))
                     {
                         //最后一天
                         if (beginTime.Date == endTime.Date)

src/Hotline/Settings/TimeLimitDomain/ExpireTimeLimitBase.cs

@@ -40,7 +40,7 @@ public abstract class ExpireTimeLimitBase
 
     public virtual async Task<int> CalcWorkTimeEx(DateTime beginTime, DateTime endTime, bool isCenter)
     {
-        var workTime = _systemSettingRepository.Get(x => x.Code == SettingConstants.WorkTime);
+        var workTime = _systemSettingRepository.Get(x => x.Code == SettingConstants.WorkTimeOrg);
         return await _expireTimeHandler.CalcWorkTimeExAsync(beginTime, endTime, workTime.SettingValue, isCenter);
     }