From c148720d31eb2f8d68352e64eaddf17fd5b66a5a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 七月 2023 18:13:14 +0800
Subject: [PATCH] 合并代码
---
cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java b/cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java
index 215d797..49c2929 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java
+++ b/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;
--
Gitblit v1.7.1