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

puzhibing

2024-03-15 889749753021d76463d85450bd95e6615886956e

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

@@ -18,4 +18,5 @@
    private List<Integer> userIds;
    private Integer insertType;
    private Integer operatorId;
    private Integer storeId;
}