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

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

 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;
}