Resolved Conflicts.

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

@@ -50,4 +50,7 @@ public class ApplicationAmendmentRequestEntity extends BaseEntity {
     @Column(name = "end_date")
     private LocalDateTime endDate;
 
+    @Column(name = "amendment_document")
+    private String amendmentDocument;
+
 }

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

@@ -22,6 +22,9 @@ public class ApplicationEvaluationEntity extends BaseEntity{
     @Column(name = "checklist")
     private String checklist;
 
+    @Column(name = "EVALUATION_DOCUMENT")
+    private String evaluationDocument;
+
     @Column(name = "file")
     private String file;
 
@@ -58,4 +61,8 @@ public class ApplicationEvaluationEntity extends BaseEntity{
 
     @Column(name = "STOP_DATE_TIME")
     private LocalDateTime stopDateTime;
+
+    @Column(name = "CLOSING_DATE")
+    private LocalDateTime closingDate;
+
 }

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

@@ -32,4 +32,7 @@ public class DocumentEntity extends BaseEntity{
     @Column(name="DOCUMENT_ATTACHMENT_ID")
     private String documentAttachmentId;
 
+    @Column(name="uploaded_by")
+    private Long uploadedBy;
+
 }

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

@@ -28,4 +28,7 @@ public class ProtocolEntity extends BaseEntity {
     @Column(name="HUB_ID")
     private Long hubId;
 
+    @Column(name = "type")
+    private String type;
+
 }