diff --git a/src/main/java/ru/ulstu/timeline/model/Event.java b/src/main/java/ru/ulstu/timeline/model/Event.java index 6021ccb..404025a 100644 --- a/src/main/java/ru/ulstu/timeline/model/Event.java +++ b/src/main/java/ru/ulstu/timeline/model/Event.java @@ -19,7 +19,7 @@ public class Event extends BaseEntity { private String title; @Column(name = "execute_date") - @Temporal(TemporalType.DATE) + @Temporal(TemporalType.TIMESTAMP) private Date executeDate; @Column(name = "create_date") diff --git a/src/main/resources/db/changelog-20181030_000000-schema.xml b/src/main/resources/db/changelog-20181030_000000-schema.xml new file mode 100644 index 0000000..0d65c2a --- /dev/null +++ b/src/main/resources/db/changelog-20181030_000000-schema.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml index 4faae2e..eb3dc55 100644 --- a/src/main/resources/db/changelog-master.xml +++ b/src/main/resources/db/changelog-master.xml @@ -11,4 +11,5 @@ + \ No newline at end of file diff --git a/src/main/resources/templates/timeline.html b/src/main/resources/templates/timeline.html index 4d2acf7..1109686 100644 --- a/src/main/resources/templates/timeline.html +++ b/src/main/resources/templates/timeline.html @@ -100,17 +100,9 @@ - - - - - - - -