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

无关风月

2025-04-11 9a60b1e59f52ab4f41e956a76eac1150f39843e3

 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;