resolved conflicts

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

@@ -0,0 +1,57 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.CallTypeEnum;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+@Data
+public class CallDetailsResponseBean {
+
+    private Long id;
+
+    private String name;
+
+    private String descriptionShort;
+
+    private String descriptionLong;
+
+    private List<LocalDateTime> dates;
+
+    private CallTypeEnum status;
+
+    private Long regionId;
+
+    private BigDecimal amount;
+
+    private BigDecimal amountMax;
+
+    private String contactInfo;
+
+    private String submissionMethod;
+
+    private Long threshold;
+
+    private String priorityArea;
+
+    private String documentationReqested;
+
+    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/CreateCallResponseBean.java

@@ -18,7 +18,9 @@ public class CreateCallResponseBean {
 
     private String descriptionLong;
 
-    private List<LocalDateTime> dates;
+    private LocalDateTime startDate;
+    
+    private LocalDateTime endDate;
 
     private CallTypeEnum status;