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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

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

@@ -18,7 +18,7 @@
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableId(value = "id")
    private Integer id;
    /**
     * 用户id