|
|
|
@ -15,6 +15,7 @@ import ru.ulstu.user.controller.UserController;
|
|
|
|
|
import javax.validation.constraints.Pattern;
|
|
|
|
|
import javax.validation.constraints.Size;
|
|
|
|
|
import java.util.Collection;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.LinkedHashSet;
|
|
|
|
|
import java.util.Objects;
|
|
|
|
|
import java.util.Set;
|
|
|
|
@ -70,11 +71,8 @@ public class UserDto implements OdinDto {
|
|
|
|
|
@Size(min = Constants.MIN_PASSWORD_LENGTH, max = 50)
|
|
|
|
|
private String passwordConfirm;
|
|
|
|
|
|
|
|
|
|
@OdinCaption("Год рождения")
|
|
|
|
|
@Size(max = 4)
|
|
|
|
|
private Integer birthYear;
|
|
|
|
|
private Date birthYear;
|
|
|
|
|
|
|
|
|
|
@OdinCaption("Ученая степень")
|
|
|
|
|
private User.UserDegree degree;
|
|
|
|
|
|
|
|
|
|
public UserDto() {
|
|
|
|
@ -172,11 +170,11 @@ public class UserDto implements OdinDto {
|
|
|
|
|
return passwordConfirm;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Integer getBirthYear() {
|
|
|
|
|
public Date getBirthYear() {
|
|
|
|
|
return birthYear;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void setBirthYear(Integer birthYear) {
|
|
|
|
|
public void setBirthYear(Date birthYear) {
|
|
|
|
|
this.birthYear = birthYear;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|