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-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupCompetitor.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupCompetitor.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupCompetitor.java
index 62172a0..ebe0e65 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupCompetitor.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupCompetitor.java
@@ -18,7 +18,7 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.NONE)
private Long id;
/**
* 参赛编号
@@ -44,7 +44,7 @@
* 参赛人id
*/
@TableField("participantId")
- private Integer participantId;
+ private Long participantId;
/**
* 参赛方（1=蓝方，2=红方）
*/
@@ -56,6 +56,16 @@
@TableField("matchResult")
private Integer matchResult;
/**
+ * 我方分数
+ */
+ @TableField("ourScore")
+ private Integer ourScore;
+ /**
+ * 对手分数
+ */
+ @TableField("opponentScore")
+ private Integer opponentScore;
+ /**
* 参赛奖励
*/
@TableField("participationIntegral")
--
Gitblit v1.7.1