Resolved Conflicts

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

@@ -5,6 +5,7 @@ import lombok.Data;
 import net.gepafin.tendermanagement.config.LocalTimeAttributeConverter;
 import org.hibernate.annotations.Where;
 
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 
 @Entity
@@ -35,4 +36,14 @@ public class ProtocolEntity extends BaseEntity {
     @Column(name = "type")
     private String type;
 
+    @Column(name = "external_protocol_year")
+    private Integer externalProtocolYear;
+
+    @Column(name = "external_protocol_date")
+    private LocalDateTime externalProtocolDate;
+
+    @Column(name = "external_protocol_number")
+    private String externalProtocolNumber;
+
+
 }