From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/model/AddParticipant.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/AddParticipant.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/AddParticipant.java
index ed87a1a..7d067ff 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/AddParticipant.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/AddParticipant.java
@@ -17,12 +17,11 @@
@ApiModelProperty(value = "姓名", dataType = "string", required = true)
private String name;
@ApiModelProperty(value = "生日", dataType = "string", required = true)
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date birthday;
+ private String birthday;
@ApiModelProperty(value = "性别（1=男，2=女）", dataType = "int", required = true)
private Integer gender;
@ApiModelProperty(value = "身高（CM）", dataType = "int", required = true)
- private Integer height;
+ private String height;
@ApiModelProperty(value = "体重（KG）", dataType = "double", required = true)
private Double weight;
@ApiModelProperty(value = "联系电话", dataType = "string", required = false)
--
Gitblit v1.7.1