Resolve Conflicts

This commit is contained in:
rajesh
2025-01-13 16:42:42 +05:30
82 changed files with 1949 additions and 517 deletions

View File

@@ -305,6 +305,8 @@ 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";
//Appointment
@@ -355,5 +357,18 @@ public class GepafinConstant {
public static final String USER_WITH_COMPANY_NOT_FOUND = "user.with.company.not.found";
public static final String USER_ACTION_FETCHED_SUCCESSFULLY = "user.action.fetched.successfully";
//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";
}