Merge remote-tracking branch 'origin/master'

puzhibing

2023-12-14 d20dbd5d97b3f418533d5d23fd337cdec9f95939

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

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

    @TableField("isOut")
    private Integer isOut;
    // 已报名人数
    @TableField(exist = false)
    private String count;