Resolve Conflict

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

@@ -39,4 +39,7 @@ public class ApplicationEntity extends BaseEntity {
     @OneToOne
     @JoinColumn(name = "PROTOCOL_NUMBER")
     private ProtocolEntity protocol;
+    
+    @Column(name = "HUB_ID")
+    private Long hubId;
     }

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

@@ -0,0 +1,38 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+@Data
+@Entity
+@Table(name = "application_evaluation")
+public class ApplicationEvaluationEntity extends BaseEntity{
+    @Column(name = "application_Id")
+    private Long applicationId;
+    @Column(name = "user_id")
+    private Long userId;
+
+    @Column(name = "criteria")
+    private String criteria;
+
+    @Column(name = "checklist")
+    private String checklist;
+
+    @Column(name = "file")
+    private String file;
+
+    @Column(name = "note")
+    private String note;
+
+    @Column(name = "status")
+    private String status;
+
+    @Column(name="IS_DELETED")
+    private Boolean isDeleted;
+
+    @ManyToOne
+    @JoinColumn(name = "assigned_applications_id", nullable = true)
+    private  AssignedApplicationsEntity assignedApplicationsEntity;
+}

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

@@ -61,4 +61,7 @@ public class BeneficiaryEntity extends BaseEntity {
 
     @Column(name = "EMAIL_PEC")
     private String emailPec;
+    
+    @Column(name = "HUB_ID")
+    private Long hubId;
 }

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

@@ -4,6 +4,8 @@ import java.math.BigDecimal;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Data;
 
@@ -56,4 +58,9 @@ public class CompanyEntity extends BaseEntity{
 
     @Column(name = "CONTACT_EMAIL")
     private String contactEmail;
+    
+    @ManyToOne
+    @JoinColumn(name = "HUB_ID")
+    private HubEntity hub;
+    
 }

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

@@ -0,0 +1,25 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+@Entity
+@Table(name = "s3_path_configuration")
+@Data
+public class S3ConfigEntity extends BaseEntity {
+
+    @Column(name = "TYPE")
+    private String type;
+
+    @Column(name = "PATH")
+    private String path;
+
+    @Column(name = "BUCKET_NAME")
+    private String bucketName;
+
+    @Column(name = "PARENT_FOLDER")
+    private String parentFolder;
+}
+