Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-04 c5cb162b5cbdb589e97290fba3ac3e9241ec48d4

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

@@ -31,7 +31,7 @@
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.INPUT)
    @TableId(value = "id", type = IdType.NONE)
    private Long id;
    /**
     * 赛事id
@@ -49,6 +49,11 @@
    @TableField("participantId")
    private Integer participantId;
    /**
     * 支付记录id
     */
    @TableField("paymentCompetitionId")
    private Long paymentCompetitionId;
    /**
     * 参加时间
     */
    @TableField("insertTime")