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/model/response/FlowEdgesResponseBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/FlowEdgesResponseBean.java
@@ -6,7 +6,7 @@ import org.springframework.security.core.parameters.P;

@Data
 public class FlowEdgesResponseBean {
-    private Long id;
+    private String id;

    private String source;