resolved conflicts

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

@@ -37,11 +37,28 @@ public class BeneficiaryEntity extends BaseEntity {
 
     @Column(name = "COUNTRY")
     private String country;
-    
+
     @Column(name = "CODICE_FISCALE")
     private String codiceFiscale;
-    
+
     @Column(name = "DATE_OF_BIRTH")
     private LocalDateTime dateOfBirth;
-    
+
+    @Column(name = "PRIVACY")
+    private Boolean privacy;
+
+    @Column(name = "TERMS")
+    private Boolean terms;
+
+    @Column(name = "MARKETING")
+    private Boolean marketing;
+
+    @Column(name = "OFFERS")
+    private Boolean offers;
+
+    @Column(name = "THIRD_PARTY")
+    private Boolean thirdParty;
+
+    @Column(name = "EMAIL_PEC")
+    private String emailPec;
 }

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

@@ -50,4 +50,10 @@ public class CompanyEntity extends BaseEntity{
     
     @Column(name = "ANNUAL_REVENUE")
     private BigDecimal annualRevenue;
+
+    @Column(name = "CONTACT_NAME")
+    private String contactName;
+
+    @Column(name = "CONTACT_EMAIL")
+    private String contactEmail;
 }