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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

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

@@ -247,8 +247,9 @@
     */
    @TableField("operatorId")
    private Integer operatorId;


    // 已报名人数
    @TableField(exist = false)
    private String count;
    @Override
    protected Serializable pkVal() {
        return this.id;