Resolved conflicts

This commit is contained in:
rajesh
2025-05-26 18:53:47 +05:30
27 changed files with 326 additions and 147 deletions

View File

@@ -32,5 +32,5 @@ public class ApplicationAmendmentRequestResponse {
private String internalNote;
private ApplicationAmendmentRequestEnum status;
private String emailTemplate;
private EmailSendResponse emailSendResponse;
private List<EmailSendResponse> emailSendResponse;
}

View File

@@ -48,5 +48,6 @@ public class ApplicationEvaluationFormResponse {
private Long appointmentTemplateId;
private String companyVatNumber;
private String companyCodiceAteco;
private List<EmailSendResponse> emailSendResponse;
}

View File

@@ -49,6 +49,6 @@ public class ApplicationEvaluationResponse {
private EvaluationVersionEnum evaluationVersion;
private String companyVatNumber;
private String companyCodiceAteco;
private EmailSendResponse emailSendResponse;
private List<EmailSendResponse> emailSendResponse;
}

View File

@@ -5,12 +5,14 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class EmailReminderResponse {
@JsonProperty("emailSendResponse")
private EmailSendResponse emailSendResponse;
private List<EmailSendResponse> emailSendResponse;
}

View File

@@ -5,9 +5,11 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class InitiatePasswordResetResponse {
private EmailSendResponse emailSendResponse;
private List<EmailSendResponse> emailSendResponse;
}