Resolve Conflicts
This commit is contained in:
@@ -156,7 +156,7 @@ public class GepafinConstant {
|
||||
public static final String IS_PIVA = "isPIVA";
|
||||
public static final String FAILED_RETAIN_FIELD = "failed.retain.field";
|
||||
public static final String USER_ALREADY_EXIST_MSG = "user.already.exist.msg";
|
||||
public static final String TOKEN_VALIDATE_SUCCESS_MSE = "token.validate.success";
|
||||
public static final String TOKEN_VALIDATE_SUCCESS_MSG = "token.validate.success";
|
||||
public static final String INVALID_REQUEST = "invalid.request";
|
||||
public static final String CODICE_FISCALE_EXISTS = "codice.fiscale.exists";
|
||||
public static final String TOTAL_STEPS_NOT_BE_ZERO = "total.steps.not.zero";
|
||||
@@ -299,5 +299,11 @@ public class GepafinConstant {
|
||||
public static final String APPLICATION_CANNOT_APPROVED_OR_REJECTED="application.cannot.approved.or.rejected";
|
||||
public static final String SUBMISSION_DATE = "submissionDate";
|
||||
public static final String ASSIGNED_AT = "assignedAt";
|
||||
public static final String AUTH = "auth";
|
||||
|
||||
//Logging
|
||||
public static final String USER_ID = "userId";
|
||||
public static final String LOGIN_ATTEMPT_ID = "loginAttemptId";
|
||||
public static final String USER_ACTION_ID = "userActionId";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user