Resolved Conflicts

src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java

@@ -8,8 +8,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.Where;
+import net.gepafin.tendermanagement.model.response.EmailSendResponse;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Entity
 @Table(name = "GEPAFIN_USER")
@@ -71,4 +73,9 @@ public class UserEntity extends BaseEntity {
     @ManyToOne
     @JoinColumn(name = "HUB_ID")
     private HubEntity hub;
+
+    @Convert(converter = EmailSendResponseConverter.class)
+    @Column(name = "EMAIL_SEND_RESPONSE", columnDefinition = "TEXT")
+    private List<EmailSendResponse> emailSendResponse;
+
 }