Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts.

This commit is contained in:
Alyona 2018-10-31 19:33:21 +04:00
parent 9013baa209
commit 0341a823d2

View File

@ -0,0 +1,19 @@
package ru.ulstu.timeline.model;
public class EventStatusDto {
private final String id;
private final String name;
public EventStatusDto(Event.EventStatus status) {
this.id = status.name();
this.name = status.getName();
}
public String getId() {
return id;
}
public String getName() {
return name;
}
}