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

mitao

2025-03-31 51f26723bee741bf112c8d0d965d0e2f2974bd04

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

@@ -21,4 +21,5 @@
    private Integer type;
    private Integer insertType;
    private Integer operatorId;
    private Integer storeId;
}