Resolved conflicts

This commit is contained in:
harish
2024-11-13 13:15:43 +05:30
11 changed files with 358 additions and 127 deletions

View File

@@ -1,8 +1,10 @@
package net.gepafin.tendermanagement.model.response;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class AmendmentFormFieldResponse {
private String fieldId;
private String label;

View File

@@ -14,8 +14,8 @@ public class ApplicationAmendmentRequestResponse {
private String note;
private Long responseDays;
private LocalDateTime startDate;
private boolean isSendNotification;
private boolean isSendEmail;
private Boolean isSendNotification;
private Boolean isSendEmail;
private Long protocolNumber;
private String callName;
private String beneficiaryName;