Resolved Conflicts.

2024-10-25 15:49:28 +05:30
parent d20b9abc07 03e487500a
commit d541492e81
63 changed files with 818 additions and 544 deletions
--- a/src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java
+++ b/src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java
@@ -6,7 +6,10 @@ public enum ApplicationStatusTypeEnum {

    DRAFT("DRAFT"),
    SUBMIT("SUBMIT"),
-    DISCARD("DISCARD");
+    AWAITING("AWAITING"),
+    READY("READY"),
+    DISCARD("DISCARD"),
+    EVALUATION("EVALUATION");

    private String value;