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

src/Hotline.Api/Controllers/IPPbxController.cs

@@ -987,6 +987,10 @@ namespace Hotline.Api.Controllers
             {
                 actionType = actionType.Where(m => new int[] { 4, 5 }.Contains(m.Key) == false).ToList();
             }
+            if (_appOptions.Value.IsLuZhou)// 542 取消【坐席动作类型统计】列表中话后整理的选项。
+			{
+				actionType = actionType.Where(m => new int[] { 1 }.Contains(m.Key) == false).ToList();
+			}
             return new
             {
                 ActionType = actionType,