resolved conflicts

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

@@ -62,5 +62,11 @@ public class CallEntity extends BaseEntity {
 
     @Column(name = "CONFIDI")
     private Boolean confidi;
+
+    @Column(name="INITIAL_FORM")
+    private Long initialForm;
+
+    @Column(name="FINAL_FORM")
+    private Long finalForm;
 }
 

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

@@ -0,0 +1,26 @@
+package net.gepafin.tendermanagement.entities;
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "FLOW_DATA")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class FlowDataEntity extends BaseEntity{
+
+    @Column(name = "FORM_ID")
+    private Long formId;
+
+    @Column(name = "CHOOSEN_FIELD")
+    private String choosenField;
+
+    @Column(name = "CHOOSEN_VALUE")
+    private String choosenValue;
+
+    @Column(name="CALL_ID")
+    private Long callId;
+}

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

@@ -0,0 +1,31 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "FLOW_EDGES")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class FlowEdgesEntity extends BaseEntity {
+
+    @Column(name = "SOURCE_ID")
+    private Long sourceId;
+
+    @Column(name = "TARGET_ID")
+    private Long targetId;
+
+    @Column(name = "TYPE", length = 255)
+    private String type;
+
+    @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;
 }