resolved conflicts

2024-09-13 18:42:25 +05:30
parent 2be419e5d0 d05e487378
commit 912530fd50
9 changed files with 56 additions and 34 deletions
--- a/src/main/java/net/gepafin/tendermanagement/entities/FlowEdgesEntity.java
+++ b/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;
+
 }