合并代码

puzhibing

2023-07-07 c148720d31eb2f8d68352e64eaddf17fd5b66a5a

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

@@ -1,6 +1,7 @@
package com.dsh.competition.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -35,22 +36,22 @@
    /**
     * 赛事id
     */
    @TableField("competitionId")
    private Integer competitionId;
    /**
     * 用户id
     */
    @TableField("appUserId")
    private Integer appUserId;
    /**
     * 用户类型（1=学员，2=参赛人员）
     */
    private Integer userType;
    /**
     * 参与者id
     */
    private Integer userId;
    @TableField("participantId")
    private Integer participantId;
    /**
     * 参加时间
     */
    @TableField("insertTime")
    private Date insertTime;