Skip to content

Commit

Permalink
revert: changes to the return value type of And query (#5507)
Browse files Browse the repository at this point in the history
#### What type of PR is this?
/area core
/milestone 2.14.x

#### What this PR does / why we need it:
撤销 https://github.com/halo-dev/halo/pull/5453/files#diff-0577b8395b1acb8e87aff2150dfe0bd15b6768c433d73d9cf43ced91d8debc4cR123 中对 And query 返回值类型的更改 这会导致插件中用到这个方法的地方出现类型不兼容问题

see also halo-sigs/plugin-moments#89

#### Does this PR introduce a user-facing change?
```release-note
None
```
  • Loading branch information
guqing committed Mar 14, 2024
1 parent f40014d commit b4564f5
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public static Query and(Collection<Query> queries) {
return new And(queries);
}

public static Query and(Query query1, Query query2) {
public static And and(Query query1, Query query2) {
Collection<Query> queries = Arrays.asList(query1, query2);
return new And(queries);
}
Expand Down

0 comments on commit b4564f5

Please sign in to comment.