Resolved Conflicts.

src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDetailsResponseBean.java

@@ -0,0 +1,12 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class AmendmentDetailsResponseBean {
+    private String amendmentDocuments;
+    private String amendmentNotes;
+    private Boolean valid;
+
+}

src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponseBean.java

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AmendmentDocumentResponseBean {
+
+    private Long amendmentId;
+    private String fieldId;
+    private String label;
+    private Boolean valid;
+    private List<DocumentResponseBean> fileDetail ;
+}

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java

@@ -21,6 +21,9 @@ public class ApplicationAmendmentRequestResponse {
     private String beneficiaryName;
     private List<AmendmentFormFieldResponse> formFields;
     private List<ApplicationFormFieldResponseBean> applicationFormFields;
+    private List<DocumentResponseBean> amendmentDocuments;
+    private String amendmentNotes;
+    private Boolean valid;
     private Long applicationId;
     private Long applicationEvaluationId;
     private LocalDateTime evaluationEndDate;

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java

@@ -21,6 +21,8 @@ public class ApplicationEvaluationResponse {
     private List<CriteriaResponse> criteria;
     private List<ChecklistResponse> checklist;
     private List<FieldResponse> files;
+    private List<EvaluationDocumentResponse> evaluationDocument;
+    private List<AmendmentDocumentResponseBean> amendmentDetails;
     private LocalDateTime createdDate;
     private LocalDateTime updatedDate;
     private String beneficiary;

src/main/java/net/gepafin/tendermanagement/model/response/EvaluationDocumentResponse.java

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EvaluationDocumentResponse {
+    private String fieldId;
+    private String nameValue;
+    private Boolean valid;
+    private List<DocumentResponseBean> fileValue ;
+
+}