Resolved conflicts.

2025-02-14 12:37:13 +05:30
parent 47c4eb774a
commit 812f13b523
5 changed files with 68 additions and 8 deletions
--- a/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
@@ -59,4 +59,7 @@ public class CompanyEntity extends BaseEntity{

    @Column(name = "CODICE_ATECO")
    private String codiceAteco;
+
+    @Column(name = "JSON")
+    private String json;
 }