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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

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

@@ -20,4 +20,6 @@
    // 筛选是平台 还是运营商 还是门店
    private Integer type;
    private Integer insertType;
    private Integer operatorId;
    private Integer storeId;
}