From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 49c2929..5d1b5b9 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
@@ -31,7 +31,7 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.NONE)
private Long id;
/**
* 赛事id
@@ -49,6 +49,16 @@
@TableField("participantId")
private Integer participantId;
/**
+ * 参与人员类型（1=学员，2=参赛者）
+ */
+ @TableField("participantType")
+ private Integer participantType;
+ /**
+ * 支付记录id
+ */
+ @TableField("paymentCompetitionId")
+ private Long paymentCompetitionId;
+ /**
* 参加时间
*/
@TableField("insertTime")
--
Gitblit v1.7.1