resolved conflicts

src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java

@@ -20,14 +20,13 @@ public class DocumentEntity extends BaseEntity{
     @Column(name="TYPE")
     private String type;
 
-    @ManyToOne
-    @JoinColumn(name = "CALL_ID")
-    private CallEntity call;
+    @Column(name="SOURCE")
+    private String source;
+
+    @Column(name="SOURCE_ID")
+    private Long sourceId;
 
-    @Column(name = "DESCRIPTION", columnDefinition = "TEXT")
-    private String description;
-    
     @Column(name ="IS_DELETED", nullable = false)
     private Boolean isDeleted = false;
-    
+
 }

src/main/java/net/gepafin/tendermanagement/entities/FlowEdgesEntity.java

@@ -25,4 +25,7 @@ public class FlowEdgesEntity extends BaseEntity {
     @Column(name="CALL_ID")
     private Long callId;
 
+    @Column(name="TRACKING_ID")
+    private String trackingId;
+
 }

src/main/java/net/gepafin/tendermanagement/entities/FormFieldEntity.java

@@ -25,4 +25,10 @@ public class FormFieldEntity extends BaseEntity{
 
     @Column(name = "VALIDATORS")
     private String validators;
+
+    @Column(name = "DESCRIPTION")
+    private String description;
+
+    @Column(name = "SORT_ORDER")
+    private Integer sortOrder;
 }