Merge pull request #17890 from abpframework/auto-merge/rel-7-4/2230

Merge branch dev with rel-7.4

docs/en/Data-Filtering.md

@@ -227,7 +227,7 @@ protected override Expression<Func<TEntity, bool>> CreateFilterExpression<TEntit
             e => !IsActiveFilterEnabled || EF.Property<bool>(e, "IsActive");
         expression = expression == null 
             ? isActiveFilter 
-            : CombineExpressions(expression, isActiveFilter);
+            : QueryFilterExpressionHelper.CombineExpressions(expression, isActiveFilter);
     }
 
     return expression;

docs/zh-Hans/Data-Filtering.md

@@ -176,7 +176,7 @@ protected override Expression<Func<TEntity, bool>> CreateFilterExpression<TEntit
             e => !IsActiveFilterEnabled || EF.Property<bool>(e, "IsActive");
         expression = expression == null 
             ? isActiveFilter 
-            : CombineExpressions(expression, isActiveFilter);
+            : QueryFilterExpressionHelper.CombineExpressions(expression, isActiveFilter);
     }
 
     return expression;