Merge branch 'master' into release

src/Hotline/Orders/OrderDomainService.cs

@@ -609,13 +609,13 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
     /// <returns></returns>
     public async Task LogAverageOrder(string userId, Scheduling scheduling, CancellationToken cancellationToken)
     {
-        //1.获取默认派单员所属的工单
-        //2.获取今天上班的人员
-        //3.给当前这个用户平均派单
+		//1.获取默认派单员所属的工单
+		//2.获取今天上班的人员
+		//3.给当前这个用户平均派单
 
-        var steps = await _workflowDomainService.GetStepsBelongsToAsync(AppDefaults.SendPoolId,
-            cancellationToken);
-        var roleId = _systemSettingCacheManager.GetSetting(SettingConstants.RolePaiDan)?.SettingValue[0];
+		var steps = await _workflowDomainService.GetStepsBelongsToAsync(AppDefaults.SendPoolId,
+		   cancellationToken);
+		var roleId = _systemSettingCacheManager.GetSetting(SettingConstants.RolePaiDan)?.SettingValue[0];
 
         var user = await _userRepository.Queryable()
             .Includes(d => d.Organization)
@@ -653,7 +653,7 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
             }, cancellationToken);
         }
 
-    }
+	}
 
     /// <summary>
     /// 触发平均派单