Resolved conflicts

src/main/java/net/gepafin/tendermanagement/enums/AssignedApplicationEnum.java

@@ -0,0 +1,21 @@
+package net.gepafin.tendermanagement.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum AssignedApplicationEnum {
+    ASSIGNED("ASSIGNED"),
+    APPROVED("APPROVED"),
+    REJECTED("REJECTED");
+
+
+    private final String value;
+
+    AssignedApplicationEnum(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+}