Resolved conflicts

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

@@ -10,6 +10,7 @@ import java.util.List;
 @Data
 public class ApplicationAmendmentRequestResponse {
     private Long id;
+    private String callEmail;
     private String note;
     private Long responseDays;
     private LocalDateTime startDate;

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

@@ -1,10 +1,12 @@
 package net.gepafin.tendermanagement.model.response;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 
 @Data
 public class CriteriaMappedField {
     private String id;
+    private String fieldName;
     private String fieldLabel;
-    private String fieldValue;
+    private Object fieldValue;
 }