Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

 cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionQuery.java

@@ -17,4 +17,6 @@
    // 用户ids
    private List<Integer> userIds;
    private Integer insertType;
    private Integer operatorId;
    private Integer storeId;
}