From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-competition/src/main/java/com/dsh/competition/model/EditParticipant.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/EditParticipant.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/EditParticipant.java
index d7ae2fe..73272a5 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/EditParticipant.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/EditParticipant.java
@@ -22,11 +22,14 @@
private String phone;
@ApiModelProperty(value = "姓名", dataType = "string", required = false)
private String name;
+ @ApiModelProperty(value = "头像", dataType = "string", required = true)
+ private String headImg;
@ApiModelProperty(value = "生日", dataType = "string", required = false)
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date birthday;
+ private String birthday;
@ApiModelProperty(value = "性别（1=男，2=女）", dataType = "int", required = false)
private Integer gender;
@ApiModelProperty(value = "身份证号码", dataType = "string", required = false)
private String idcard;
+ @ApiModelProperty(value = "是否为学员1是0不是", dataType = "int", required = false)
+ private Integer isStudent;
}
--
Gitblit v1.7.1