Resolved conflicts

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

@@ -12,4 +12,5 @@ public class ApplicationEvaluationRequest {
     private List<FieldRequest> files;
     private String note;
     private ApplicationStatusForEvaluation applicationStatus;
+    private String motivation;
 }

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java

@@ -26,6 +26,7 @@ public class ApplicationEvaluationResponse {
     private String beneficiary;
     private Long protocolNumber;
     private String callName;
+    private String motivation;
     private LocalDateTime submissionDate;
     private LocalDateTime evaluationEndDate;
     private LocalDateTime callEndDate;

src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java

@@ -20,6 +20,7 @@ public class AssignedApplicationsResponse extends BaseBean {
     private LocalDateTime submissionDate;
     private LocalDateTime callStartDate;
     private LocalDateTime callEndDate;
+    private String companyName;
 
 }
 

src/main/java/net/gepafin/tendermanagement/model/response/CommunicationResponseBean.java

@@ -16,6 +16,10 @@ public class CommunicationResponseBean {
 
     private LocalDateTime updatedDate;
 
+    private Long senderUserId;
+
+    private Long receiverUserId;
+
     private Long amendmentId;
     public CommunicationResponseBean(LocalDateTime commentedDate, String comment, String title, LocalDateTime createdDate, LocalDateTime updatedDate, Long amendmentId) {