Resolve Conflicts

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

@@ -50,4 +50,7 @@ public class ApplicationAmendmentRequestEntity extends BaseEntity {
     @Column(name = "end_date")
     private LocalDateTime endDate;
 
+    @Column(name = "amendment_document")
+    private String amendmentDocument;
+
 }

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

@@ -42,4 +42,17 @@ public class ApplicationEntity extends BaseEntity {
     @ManyToOne
     @JoinColumn(name = "USER_WITH_COMPANY_ID")
     private UserWithCompanyEntity userWithCompany;
+
+    @Column(name = "NDG")
+    private String ndg;
+
+    @Column(name = "ID_VISURA")
+    private String idVisura;
+
+    @Column(name = "NDG_STATUS")
+    private String ndgStatus;
+
+    @Column(name = "APPOINTMENT_ID")
+    private String appointmentId;
+
     }

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

@@ -22,6 +22,9 @@ public class ApplicationEvaluationEntity extends BaseEntity{
     @Column(name = "checklist")
     private String checklist;
 
+    @Column(name = "EVALUATION_DOCUMENT")
+    private String evaluationDocument;
+
     @Column(name = "file")
     private String file;
 
@@ -58,4 +61,5 @@ public class ApplicationEvaluationEntity extends BaseEntity{
 
     @Column(name = "STOP_DATE_TIME")
     private LocalDateTime stopDateTime;
+
 }

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

@@ -51,5 +51,6 @@ public class CompanyEntity extends BaseEntity{
     @JoinColumn(name = "HUB_ID")
     private HubEntity hub;
 
-    
+    @Column(name = "NDG")
+    private String ndg;
 }

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

@@ -29,4 +29,10 @@ public class DocumentEntity extends BaseEntity{
     @Column(name ="IS_DELETED", nullable = false)
     private Boolean isDeleted = false;
 
+    @Column(name="DOCUMENT_ATTACHMENT_ID")
+    private String documentAttachmentId;
+
+    @Column(name="uploaded_by")
+    private Long uploadedBy;
+
 }

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

@@ -54,4 +54,13 @@ public class HubEntity extends BaseEntity{
 
 	@Column(name = "EMAIL_SERVICE_CONFIG")
 	private String emailServiceConfig;
+
+	@Column(name = "AUTH_TOKEN")
+	private String authToken;
+
+	@Column(name = "APPOINTMENT_AUTH_TOKEN_ID")
+	private String appointmentAuthTokenId;
+
+	@Column(name = "AREA_CODE")
+	private String areaCode;
 }

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

@@ -28,4 +28,7 @@ public class ProtocolEntity extends BaseEntity {
     @Column(name="HUB_ID")
     private Long hubId;
 
+    @Column(name = "type")
+    private String type;
+
 }