Merge remote-tracking branch 'origin/master'

puzhibing

2023-12-11 66107e6f0bb5c47192eb0178aba60dc9df061be8

 cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java

@@ -16,7 +16,7 @@

/**
 * <p>
 * 
 *
 * </p>
 *
 * @author jqs
@@ -237,6 +237,7 @@
    // 已报名人数
    @TableField(exist = false)
    private String count;

    @Override
    protected Serializable pkVal() {
        return this.id;