Resolved Conflicts

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

@@ -5,6 +5,7 @@ import net.gepafin.tendermanagement.model.response.ApplicationFormFieldResponseB
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 
 @Data
@@ -18,6 +19,8 @@ public class ApplicationResponse{
 
     private LocalDateTime callEndDate;
 
+    private LocalTime callEndTime;
+
     private LocalDateTime modifiedDate;
 
     private Integer progress;

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

@@ -5,6 +5,7 @@ import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 
 @Data
 public class NextOrPreviousFormResponse {
@@ -20,6 +21,10 @@ public class NextOrPreviousFormResponse {
 	private Long completedSteps;
 	
 	private Long currentStep;
+
+	private LocalDateTime callEndDate;
+
+	private LocalTime callEndTime;
 	
 	private Long companyId;