From ef7358cd05da26ca589e23a82154b8b6ce0b0a7e Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.RIHTARSIC@ext.ec.europa.eu>
Date: Thu, 28 Apr 2022 11:23:53 +0200
Subject: [PATCH] Fix merge issue
---
.../europa/ec/edelivery/smp/data/model/DBRevisionLog.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBRevisionLog.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBRevisionLog.java
index a69d8b00b..6f1a9350d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBRevisionLog.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBRevisionLog.java
@@ -8,7 +8,7 @@ import org.hibernate.envers.RevisionNumber;
import org.hibernate.envers.RevisionTimestamp;
import javax.persistence.*;
-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
/**
* Implementation of hibernate envers Revision log entity.
@@ -38,7 +38,7 @@ public class DBRevisionLog {
* Date of the modification.
*/
@Column(name = "REVISION_DATE")
- private LocalDateTime revisionDate;
+ private OffsetDateTime revisionDate;
public String getUserName() {
@@ -49,11 +49,11 @@ public class DBRevisionLog {
this.userName = userName;
}
- public LocalDateTime getRevisionDate() {
+ public OffsetDateTime getRevisionDate() {
return revisionDate;
}
- public void setRevisionDate(LocalDateTime revisionDate) {
+ public void setRevisionDate(OffsetDateTime revisionDate) {
this.revisionDate = revisionDate;
}
--
GitLab