christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into max_userNumber

Browse Source 
# Conflicts:
#	src/main/resources/templates/editMembers.html
This commit is contained in:
killerber4t
2020-03-19 15:55:59 +01:00
parent c343b5adbe d9388c282c
commit d2b5b44a0d
10 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/mops/gruppen2/domain/User.java
View File

@ -3,14 +3,16 @@ package mops.gruppen2.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Getter
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(exclude = {"givenname", "familyname", "email"})
public class User {
private final String id;
private final String givenname;
private final String familyname;
private final String email;
private String id;
private String givenname;
private String familyname;
private String email;
}