Resolve Conflict

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

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
+
+import java.util.List;
+@Data
+public class ApplicationEvaluationRequest {
+
+    private List<CriteriaRequest> criteria;
+    private List<ChecklistRequest> checklist;
+    private List<FieldRequest> field;
+    private String note;
+}

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

@@ -0,0 +1,9 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class ChecklistRequest {
+    private Long id;
+    private Boolean valid;
+}

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

@@ -2,7 +2,6 @@ package net.gepafin.tendermanagement.model.request;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.List;
 
 import lombok.Data;

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

@@ -0,0 +1,10 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class CriteriaRequest {
+    private Long id;
+    private Long score;
+    private Boolean valid;
+}

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

@@ -0,0 +1,9 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class FieldRequest {
+    private String id;
+    private Boolean valid;
+}

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

@@ -0,0 +1,20 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class S3ConfigReq {
+    @NotNull
+    private String path;
+
+    @NotNull
+    private String type;
+
+    @NotNull
+    private String bucketName;
+
+    @NotNull
+    private String parentFolder;
+}

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

@@ -0,0 +1,2 @@
+package net.gepafin.tendermanagement.model.request;public class UpdateApplicationEvaluationRequest {
+}