Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 2493985a5bdfc6496381b39de0f9713b79c2e51d

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

@@ -234,7 +234,9 @@
     */
    @TableField("operatorId")
    private Integer operatorId;

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