BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved conflicts

Browse Source
This commit is contained in:
rajesh
2025-05-26 18:53:47 +05:30
parent 1123faa710 4e34486581
commit 0fa5d39dc6
27 changed files with 326 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java
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;
}

1
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java
View File

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

2
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java
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;
}

4
src/main/java/net/gepafin/tendermanagement/model/response/EmailReminderResponse.java
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;
}

4
src/main/java/net/gepafin/tendermanagement/model/response/InitiatePasswordResetResponse.java
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;
}

6
src/main/java/net/gepafin/tendermanagement/model/util/JWTToken.java
View File

@@ -6,6 +6,8 @@ import lombok.Data;
import net.gepafin.tendermanagement.model.response.EmailSendResponse;
import net.gepafin.tendermanagement.model.response.LoginResponse;
import java.util.List;
/**
* JWTToken
*/
@@ -18,14 +20,14 @@ public class JWTToken {
private LoginResponse loginResponse;
@JsonProperty("emailSendResponse")
private EmailSendResponse emailSendResponse;
private List<EmailSendResponse> emailSendResponse;
public JWTToken(String token, LoginResponse loginResponse) {
this.token = token;
this.loginResponse = loginResponse;
}
public JWTToken(String token, LoginResponse loginResponse, EmailSendResponse emailSendResponse) {
public JWTToken(String token, LoginResponse loginResponse, List<EmailSendResponse> emailSendResponse) {
this.token = token;
this.loginResponse = loginResponse;
this.emailSendResponse = emailSendResponse;