Merge branch 'master' of git.inpt.fr:tocard-inc/enseeiht/projet-web
This commit is contained in:
commit
f3cb2e5da9
|
@ -28,7 +28,7 @@ public class User implements Serializable {
|
||||||
// mot de passe hashé en sha256
|
// mot de passe hashé en sha256
|
||||||
@NonNull
|
@NonNull
|
||||||
@NotBlank
|
@NotBlank
|
||||||
private transient String password;
|
private String password;
|
||||||
|
|
||||||
// portefeuille
|
// portefeuille
|
||||||
@OneToMany(mappedBy = "owner")
|
@OneToMany(mappedBy = "owner")
|
||||||
|
@ -39,7 +39,7 @@ public class User implements Serializable {
|
||||||
private Integer balance = 0;
|
private Integer balance = 0;
|
||||||
|
|
||||||
@Column(unique = true)
|
@Column(unique = true)
|
||||||
private transient String sessionID;
|
private String sessionID;
|
||||||
|
|
||||||
public User(String username, String password) {
|
public User(String username, String password) {
|
||||||
this.username = username;
|
this.username = username;
|
||||||
|
|
Loading…
Reference in a new issue