Resolved Conflicts

2025-06-03 19:23:46 +05:30
parent ba261783b5 5df897680a
commit a3aab4d488
125 changed files with 4072 additions and 541 deletions
--- a/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
@@ -53,9 +53,6 @@ public class CompanyEntity extends BaseEntity{
    @JoinColumn(name = "HUB_ID")
    private HubEntity hub;

-//    @Column(name = "JSON")
-//    private String json;
-
    @Column(name = "NDG")
    private String ndg;

@@ -64,4 +61,7 @@ public class CompanyEntity extends BaseEntity{

    @Column(name = "JSON")
    private String json;
+
+    @Column(name = "PEC")
+    private String pec;
 }