From 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 01 八月 2023 09:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/model/EditParticipant.java | 3 +--
1 files changed, 1 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..b8fc431 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
@@ -23,8 +23,7 @@
@ApiModelProperty(value = "姓名", dataType = "string", required = false)
private String name;
@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)
--
Gitblit v1.7.1