From f4894c44735012e51b7f3ade126b5bf9d7757202 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.java
index 30eaa97..b187cbf 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.java
@@ -4,7 +4,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.util.Date;
/**
* @author zhibing.pu
@@ -16,7 +19,7 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.NONE)
private Long id;
/**
* 世界杯id
@@ -42,5 +45,21 @@
* 参赛人员id
*/
@TableField("participantId")
- private Integer participantId;
+ private Long participantId;
+ /**
+ * 是否已参赛（0=否，1=是）
+ */
+ @TableField("alreadyEntered")
+ private Integer alreadyEntered;
+ /**
+ * 添加时间
+ */
+ @TableField("createTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ /**
+ * 课时支付存储的数据
+ */
+ @TableField("content")
+ private String content;
}
--
Gitblit v1.7.1