Resolved conflicts

2024-12-31 14:25:48 +05:30
parent 4eeee4be16 a0af62b67e
commit a7a6b369d7
122 changed files with 4364 additions and 572 deletions
--- a/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
@@ -66,4 +66,6 @@ public class CompanyEntity extends BaseEntity{
    @Column(name = "JSON")
    private String json;
    
+    @Column(name = "NDG")
+    private String ndg;
 }