Resolved conflicts

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

@@ -91,5 +91,11 @@ public class CallEntity extends BaseEntity {
 
     @Column(name = "evaluationVersion")
     private String evaluationVersion;
+
+    @Column(name = "NUMBER_OF_CHECK")
+    private Long numberOfCheck;
+
+    @Column(name = "PRODUCT_ID")
+    private Long productId;
 }
 

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

@@ -38,7 +38,12 @@ public class SystemEmailTemplatesEntity extends BaseEntity {
 
 	@Column(name = "email_scenario")
 	private String emailScenario;
-    
+
+	@ManyToOne
+	@JoinColumn(name = "HUB_ID")
+	private HubEntity hubEntity;
+
+
 	public enum SystemEmailTemplatesEntityTypeEnum {
 
 		APPLICATION_SUBMISSION_TO_USER_AND_COMPANY("APPLICATION_SUBMISSION_TO_USER_AND_COMPANY"),