Resolve Conflicts

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

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 public enum ApplicationEvaluationStatusTypeEnum {
     OPEN ("OPEN"),
     SOCCORSO("SOCCORSO"),
+    EXPIRED("EXPIRED"),
     CLOSE("CLOSE");
 
     private String value;

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

@@ -147,7 +147,11 @@ public enum UserActionContextEnum {
     GET_FORM("GET_FORM"),
     CREATE_FORM("CREATE_FORM"),
     UPDATE_FORM("UPDATE_FORM"),
-    DELETE_FORM("DELETE_FORM");
+    DELETE_FORM("DELETE_FORM"),
+    
+    /** scheduler action context **/
+    AMENDMENT_EXPIRATION_SCHEDULER("AMENDMENT_EXPIRATION_SCHEDULER"),
+    EVALUATION_EXPIRATION_SCHEDULER("EVALUATION_EXPIRATION_SCHEDULER");
 
     private final String value;
 

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

@@ -10,7 +10,8 @@ public enum UserActionLogsEnum {
     VIEW("VIEW"),
     INSERT("INSERT"),
     DOWNLOAD("DOWNLOAD"),
-    UPLOAD("UPLOAD");
+    UPLOAD("UPLOAD"),
+    SCHEDULER("SCHEDULER");
 
     private final String value;