resolved conflicts

2024-10-08 21:39:01 +05:30
parent c64316c514 293b0f06f7
commit 150a5e4d24
33 changed files with 582 additions and 136 deletions
--- a/src/main/java/net/gepafin/tendermanagement/model/response/CompanyResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/CompanyResponse.java
@@ -22,5 +22,6 @@ public class CompanyResponse extends BaseBean{
    private String numberOfEmployees;
    private BigDecimal annualRevenue;
    private Boolean isLegalRepresentant;
-    
+    private String contactName;
+    private String contactEmail;
 }