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

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

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
This commit is contained in:
XXNitram
2020-03-18 14:27:54 +01:00
parent 838bff1d9f e9ee776047
commit f292700c78
13 changed files with 114 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/mops/gruppen2/domain/EventDTO.java → src/main/java/mops/gruppen2/domain/dto/EventDTO.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.domain;
package mops.gruppen2.domain.dto;
import lombok.Data;
import org.springframework.data.annotation.Id;

16
src/main/java/mops/gruppen2/domain/dto/InviteLinkDTO.java Normal file
View File

@ -0,0 +1,16 @@
package mops.gruppen2.domain.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.springframework.data.annotation.Id;
import org.springframework.data.relational.core.mapping.Table;
@Table("invite")
@Data
@AllArgsConstructor
public class InviteLinkDTO {
@Id
Long link_id;
Long group_id;
String invite_link;
}