Resolved conflicts

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

@@ -12,10 +12,9 @@ public class ApplicationEntity extends BaseEntity {
 
 	@Column(name = "USER_ID")
 	private Long userId;
-	
-    @ManyToOne
-    @JoinColumn(name = "COMPANY_ID", nullable = false)
-	private CompanyEntity company;
+
+    @Column(name = "COMPANY_ID")
+    private Long companyId;
 
     @Column(name = "SUBMISSION_DATE")
     private LocalDateTime submissionDate;
@@ -39,4 +38,8 @@ public class ApplicationEntity extends BaseEntity {
     
     @Column(name = "HUB_ID")
     private Long hubId;
+
+    @ManyToOne
+    @JoinColumn(name = "USER_WITH_COMPANY_ID")
+    private UserWithCompanyEntity userWithCompany;
     }

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

@@ -34,6 +34,11 @@ public class BeneficiaryPreferredCallEntity extends BaseEntity{
 
     @Column(name = "STATUS", length = 255)
     private String status;
+
     @Column(name="IS_DELETED")
     private Boolean isDeleted;
+
+    @ManyToOne
+    @JoinColumn(name = "USER_WITH_COMPANY_ID")
+    private UserWithCompanyEntity userWithCompany;
 }

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

@@ -45,5 +45,9 @@ public class FaqEntity extends BaseEntity {
     @Column(name ="COMPANY_ID")
     private Long companyId;
 
+    @ManyToOne
+    @JoinColumn(name = "USER_WITH_COMPANY_ID")
+    private UserWithCompanyEntity userWithCompany;
+
 }
 

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

@@ -1,8 +1,6 @@
 package net.gepafin.tendermanagement.entities;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Data;
 
 @Data
@@ -28,4 +26,7 @@ public class UserCompanyDelegationEntity extends BaseEntity{
 	@Column(name="STATUS")
 	private String status;
 
+	@ManyToOne
+	@JoinColumn(name = "USER_WITH_COMPANY_ID")
+	private UserWithCompanyEntity userWithCompany;
 }