Resolved conflicts
This commit is contained in:
@@ -305,6 +305,7 @@ public class GepafinConstant {
|
||||
public static final String USER_ID = "userId";
|
||||
public static final String LOGIN_ATTEMPT_ID = "loginAttemptId";
|
||||
public static final String USER_ACTION_ID = "userActionId";
|
||||
public static final String RESET_PASSWORD_URL_FORMAT = "/reset-password?token=%s&email=%s";
|
||||
public static final String VALID_VATNUMBER_MSG = "valid.vatnumber.message";
|
||||
public static final String ATLEAST_ONE_ID_REQUIRED="atleast.one.id.required";
|
||||
|
||||
@@ -368,5 +369,18 @@ public class GepafinConstant {
|
||||
public static final String HUB="hub";
|
||||
public static final String NAME="name";
|
||||
|
||||
//action log response
|
||||
public static final String STATUS_CODE_STRING = "statusCode";
|
||||
public static final String GET_STATUS_CODE_STRING = "status";
|
||||
public static final String MESSAGE_STRING = "message";
|
||||
public static final String AMOUNT_ACCEPTED_REQUIRED_WHILE_APPROVING_APPLICATION="amount.accepted.required";
|
||||
public static final String CALL_NAME="callName";
|
||||
public static final String NUMBER_OF_APPLICATIONS="numberOfApplications";
|
||||
public static final String STATUS="status";
|
||||
public static final String COUNT="count";
|
||||
public static final String APPLICATION_PER_CALL="applicationPerCall";
|
||||
public static final String APPLICATION_PER_STATUS="applicationPerStatus";
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user