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

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

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

@@ -49,6 +49,11 @@
    @TableField("participantId")
    private Integer participantId;
    /**
     * 参与人员类型（1=学员，2=参赛者）
     */
    @TableField("participantType")
    private Integer participantType;
    /**
     * 支付记录id
     */
    @TableField("paymentCompetitionId")