Resolved Conflicts

src/main/java/net/gepafin/tendermanagement/entities/ProtocolEntity.java

@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.Data;
+import net.gepafin.tendermanagement.config.LocalTimeAttributeConverter;
 
 import java.time.LocalTime;
 
@@ -20,6 +21,7 @@ public class ProtocolEntity extends BaseEntity {
     private Long call;
 
     @Column(name = "TIME", nullable = false)
+    @Convert(converter = LocalTimeAttributeConverter.class)
     private LocalTime time;
 
     @Column(name="APPLICATION_ID")