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

Merge remote-tracking branch 'origin/csv-import' into feature-orga-csv

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/APIController.java
#	src/main/resources/templates/create.html
This commit is contained in:
XXNitram
2020-03-18 03:23:22 +01:00
parent 179062eed9 2c3531657d
commit 4b1627a993
5 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,10 +3,11 @@ package mops.gruppen2.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Value;
import lombok.NoArgsConstructor;
@Value
@Data
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(exclude = {"givenname", "familyname", "email"})
public class User {
String user_id;