Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-10 f95325fd2635a9af08c0acac70e70379978d128a

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

@@ -49,6 +49,11 @@
    @TableField("participantId")
    private Integer participantId;
    /**
     * 支付记录id
     */
    @TableField("paymentCompetitionId")
    private Long paymentCompetitionId;
    /**
     * 参加时间
     */
    @TableField("insertTime")