Resolved Conflicts.

src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AmendmentDetailsRequest {
+
+    private String fieldId;
+
+    private Long amendmentId;
+
+    private Boolean valid;
+}

src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFieldRequest.java

@@ -0,0 +1,13 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class AmendmentFieldRequest {
+
+    private String fieldId;
+    private String nameValue;
+    private String fileValue;
+    private Boolean valid = false;
+
+}

src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormField.java

@@ -9,9 +9,13 @@ public class AmendmentFormField {
 	
     private String fieldId;
 
+    private String label;
+
     private String fieldValue;
     
-    private String isUploadedBy;
+    private Boolean valid;
+
+
     
     
     public enum AmendmentIsUploadedByEnum {

src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AmendmentFormFieldRequest {
+
+    private String fieldId;
+
+    private Object fieldValue;
+
+    private Boolean valid;
+}

src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java

@@ -7,5 +7,7 @@ import lombok.Data;
 @Data
 public class ApplicationAmendmentRequestBean {
     private String note;
-    private List<ApplicationFormFieldRequestBean> applicationFormFields;
+    private List<AmendmentFormFieldRequest> applicationFormFields;
+    private String amendmentDocuments;
+    private String amendmentNotes;
 }

src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java

@@ -10,6 +10,8 @@ public class ApplicationEvaluationRequest {
     private List<CriteriaRequest> criteria;
     private List<ChecklistRequest> checklist;
     private List<FieldRequest> files;
+    private List<EvaluationDocumentRequest> evaluationDocument;
+    private List<AmendmentDetailsRequest> amendmentDetails;
     private String note;
     private ApplicationStatusForEvaluation applicationStatus;
     private String motivation;

src/main/java/net/gepafin/tendermanagement/model/request/EvaluationDocumentRequest.java

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class EvaluationDocumentRequest {
+
+    private String fieldId;
+
+    private String nameValue;
+
+    private String fileValue;
+
+    private Boolean valid;
+}

src/main/java/net/gepafin/tendermanagement/model/request/UpdateAssignedApplicationRequest.java

@@ -0,0 +1,10 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
+@Data
+public class UpdateAssignedApplicationRequest {
+    private String note;
+    private AssignedApplicationEnum status;
+    private Long userId;
+}