resolved conflicts

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;

src/main/java/net/gepafin/tendermanagement/model/request/FormFieldRequest.java

@@ -10,6 +10,10 @@ public class FormFieldRequest {
 
     private String name;
 
+    private String description;
+
+    private Integer sortOrder;
+
     private String label;
 
     private List<SettingRequestBean> settings;

src/main/java/net/gepafin/tendermanagement/model/response/DocumentResponseBean.java

@@ -1,6 +1,9 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum;
+import net.gepafin.tendermanagement.enums.DocumentTypeEnum;
+
 
 import java.time.LocalDateTime;
 
@@ -13,7 +16,11 @@ public class DocumentResponseBean {
 
     private String filePath;
 
-    private String description;
+    private DocumentTypeEnum type;
+
+    private DocumentSourceTypeEnum source;
+
+    private Long sourceId;
 
     private LocalDateTime createdDate;
 

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;
 

src/main/java/net/gepafin/tendermanagement/model/response/FormFieldResponseBean.java

@@ -14,6 +14,11 @@ public class FormFieldResponseBean {
 
     private String label;
 
+    private String description;
+
+    private Integer sortOrder;
+
+
     private List<SettingResponseBean> settings;
 
     private Map<String,Object> validators;