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/request/FlowEdgesRequestBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/FlowEdgesRequestBean.java
@@ -5,6 +5,8 @@ import lombok.Data;
@Data
 public class FlowEdgesRequestBean {

+    private String id;
+
    private String source;

    private String target;