Resolve Conflict

This commit is contained in:
harish
2024-10-28 16:15:27 +05:30
11 changed files with 244 additions and 140 deletions

View File

@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
import java.time.LocalDateTime;
import java.util.List;
@@ -12,6 +13,7 @@ public class ApplicationEvaluationResponse {
private Long id;
private Long applicationId;
private ApplicationStatusTypeEnum applicationStatus;
private Long assignedApplicationId;
private String note;
private ApplicationEvaluationStatusTypeEnum status;