Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

 cloud-server-competition/src/main/java/com/dsh/competition/model/EditParticipant.java

@@ -28,4 +28,6 @@
    private Integer gender;
    @ApiModelProperty(value = "身份证号码", dataType = "string", required = false)
    private String idcard;
    @ApiModelProperty(value = "是否为学员1是0不是", dataType = "int", required = false)
    private Integer isStudent;
}