develop #3

Merged
Petr merged 18 commits from develop into master 2025-02-19 12:37:36 +00:00
2 changed files with 3 additions and 1 deletions
Showing only changes of commit e3d5eee711 - Show all commits

View File

@ -30,7 +30,7 @@ public class Visit {
private LocalDateTime endVisit; private LocalDateTime endVisit;
@Column(name = "is_finished", nullable = false) @Column(name = "is_finished", nullable = false)
private final boolean isFinished = false; private boolean isFinished = false;
@ManyToOne(fetch = FetchType.EAGER) @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "start_terminal_id", referencedColumnName = "code", nullable = false) @JoinColumn(name = "start_terminal_id", referencedColumnName = "code", nullable = false)

View File

@ -24,4 +24,6 @@ public class VisitDTO {
// превратить обратно можно с помощью LocalDateTime.parse(). // превратить обратно можно с помощью LocalDateTime.parse().
private String durationVisit; private String durationVisit;
private String officeName; private String officeName;
private String typePassage; // Строка либо PASSAGE_CARD, либо PASSAGE_TELEPHONE
} }