Resolve Conflicts

2024-12-20 16:49:22 +05:30
parent 5c7f96574b ec9a1c8bf3
commit 832666a4d4
82 changed files with 2778 additions and 219 deletions
--- a/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
@@ -51,5 +51,6 @@ public class CompanyEntity extends BaseEntity{
    @JoinColumn(name = "HUB_ID")
    private HubEntity hub;

-    
+    @Column(name = "NDG")
+    private String ndg;
 }