Merge branch 'master' into Leo/masterRegNo
This commit is contained in:
@ -8,6 +8,8 @@ import ovh.herisson.Clyde.Tables.Msg.Message;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
|
||||
|
||||
@Entity
|
||||
@Table(name = "Users")
|
||||
@ -24,7 +26,8 @@ public class User {
|
||||
private String country;
|
||||
private Date birthDate;
|
||||
private String profilePictureUrl;
|
||||
private ovh.herisson.Clyde.Tables.Role role;
|
||||
private Role role;
|
||||
@JsonIgnore
|
||||
private String password;
|
||||
|
||||
////// Extension Messagerie /////
|
||||
|
Reference in New Issue
Block a user