Resolved conflicts

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

@@ -35,23 +35,10 @@ public class CallDetailsResponseBean {
 
     private String priorityArea;
 
-    private String documentationReqested;
+    private String documentationRequested;
 
     private LocalDateTime createdDate;
 
     private LocalDateTime updatedDate;
 
-    private List<LookUpDataResponse> aimedTo;
-
-    private List<EvaluationCriteriaResponseBean> criteria;
-
-    private List<DocumentResponseBean> docs;
-
-    private List<FaqResponseBean> faq;
-
-    private List<DocumentResponseBean> images;
-
-    private List<LookUpDataResponse> checkList;
-
-    private String currentStep;
 }

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

@@ -18,9 +18,7 @@ public class CallResponse {
 
     private String descriptionLong;
 
-    private LocalDateTime startDate;
-    
-    private LocalDateTime endDate;
+    private List<LocalDateTime> dates;
 
     private CallStatusEnum status;
 
@@ -38,7 +36,7 @@ public class CallResponse {
 
     private String priorityArea;
 
-    private String documentationReqested;
+    private String documentationRequested;
     
     private Boolean confidi;
 

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

@@ -23,4 +23,12 @@ public class FaqResponseBean extends BaseBean {
 
     private LocalDateTime responseDate;
 
+    private Long lookUpDataId;
+
+    private String title;
+
+    private String value;
+
+
+
 }