From c0f6294b0be6789fddd652f89f820fcf6d5526cf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 七月 2023 17:32:39 +0800
Subject: [PATCH] 合并代码
---
cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java | 14 +++++++++-----
1 files changed, 9 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 c80a11a..215d797 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
@@ -30,8 +30,8 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.INPUT)
+ private Long id;
/**
* 赛事id
*/
@@ -39,11 +39,15 @@
/**
* 用户id
*/
- private Integer userId;
+ private Integer appUserId;
/**
- * 状态（1=正常，2=取消）
+ * 用户类型（1=学员，2=参赛人员）
*/
- private Integer status;
+ private Integer userType;
+ /**
+ * 参与者id
+ */
+ private Integer userId;
/**
* 参加时间
*/
--
Gitblit v1.7.1