From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-competition/src/main/java/com/dsh/competition/entity/Participant.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/entity/Participant.java b/cloud-server-competition/src/main/java/com/dsh/competition/entity/Participant.java
index d9146e3..50cc25c 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/entity/Participant.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/entity/Participant.java
@@ -4,6 +4,7 @@
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;
@@ -18,7 +19,7 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id")
private Integer id;
/**
* 用户id
@@ -31,9 +32,15 @@
@TableField("name")
private String name;
/**
+ * 头像
+ */
+ @TableField("headImg")
+ private String headImg;
+ /**
* 生日
*/
@TableField("birthday")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date birthday;
/**
* 性别（1=男，2=女）
@@ -69,5 +76,6 @@
* 添加时间
*/
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
}
--
Gitblit v1.7.1