Resolved conflicts

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

@@ -1,6 +1,7 @@
 package net.gepafin.tendermanagement.model.request;
 
 import java.math.BigDecimal;
+import java.util.Map;
 
 import lombok.Data;
 
@@ -23,4 +24,5 @@ public class CompanyRequest {
     private Boolean isLegalRepresentant;
     private String contactName;
     private String contactEmail;
+    private Map<String, Object> vatCheckResponse;
 }

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

@@ -0,0 +1,45 @@
+package net.gepafin.tendermanagement.model.request;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import net.gepafin.tendermanagement.entities.UserWithCompanyEntity;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class NotificationReq {
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    Long id;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    Long userId;
+
+    String message;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    String notificationType;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    String status;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private LocalDateTime createdDate;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private LocalDateTime updatedDate;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private String redirectUrl;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private String title;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private List<Long> companyIds;
+
+    @JsonIgnore
+    private UserWithCompanyEntity userWithCompanyEntity;
+}