Resolved conflicts

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

@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.model.request;
 import lombok.Data;
 import net.gepafin.tendermanagement.enums.ApplicationStatusForEvaluation;
 
+import java.math.BigDecimal;
 import java.util.List;
 @Data
 public class ApplicationEvaluationRequest {
@@ -15,4 +16,5 @@ public class ApplicationEvaluationRequest {
     private String note;
     private ApplicationStatusForEvaluation applicationStatus;
     private String motivation;
+    private BigDecimal amountAccepted;
 }