Resolved Conflicts

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

@@ -3,8 +3,10 @@ package net.gepafin.tendermanagement.entities;
 import jakarta.persistence.*;
 import lombok.Data;
 import org.hibernate.annotations.Where;
+import net.gepafin.tendermanagement.model.response.EmailSendResponse;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Entity
 @Table(name="application_amendment_request")
@@ -53,7 +55,10 @@ public class ApplicationAmendmentRequestEntity extends BaseEntity {
     @Column(name = "amendment_document")
     private String amendmentDocument;
 
-
     @Column(name = "CLOSING_DATE")
     private LocalDateTime closingDate;
+
+    @Convert(converter = EmailSendResponseConverter.class)
+    @Column(name = "EMAIL_SEND_RESPONSE", columnDefinition = "TEXT")
+    private List<EmailSendResponse> emailSendResponse;
 }