Resolved Conflicts

src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java

@@ -1,6 +1,7 @@
 package net.gepafin.tendermanagement.model.request;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationStatusForEvaluation;
 
 import java.util.List;
 @Data
@@ -10,4 +11,5 @@ public class ApplicationEvaluationRequest {
     private List<ChecklistRequest> checklist;
     private List<FieldRequest> files;
     private String note;
+    private ApplicationStatusForEvaluation applicationStatus;
 }