Resolved Conflicts.

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

@@ -14,6 +14,13 @@ public class AssignedApplicationsResponse extends BaseBean {
     private AssignedApplicationEnum status;
     private String note;
     private LocalDateTime assignedAt;
+    private Long protocolNumber;
+    private String callName;
+    private String beneficiaryName;
+    private LocalDateTime submissionDate;
+    private LocalDateTime callStartDate;
+    private LocalDateTime callEndDate;
+
 }
 
 

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

@@ -20,6 +20,8 @@ public class CallDetailsResponseBean {
 
     private List<LocalDateTime> dates;
 
+    private Boolean confidi;
+
     private CallStatusEnum status;
 
     private Long regionId;

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

@@ -5,8 +5,10 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.List;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 import net.gepafin.tendermanagement.enums.CallStatusEnum;
+import net.gepafin.tendermanagement.util.DynamicLocalTimeSerializer;
 
 @Data
 public class CallResponse {
@@ -47,8 +49,10 @@ public class CallResponse {
 
     private String phoneNumber;
 
+    @JsonSerialize(using = DynamicLocalTimeSerializer.class)
     private LocalTime startTime;
 
+    @JsonSerialize(using = DynamicLocalTimeSerializer.class)
     private LocalTime endTime;
 
     private LocalDateTime createdDate;