Resolved conflicts
This commit is contained in:
@@ -292,9 +292,12 @@ public class GepafinConstant {
|
||||
public static final String ENCRYPT_KEY = "U2VjdXJlRW5jcnlwdEtleQ==";
|
||||
public static final String APPLICATION_DOCUMENTS_NOT_FOUND_MSG = "application.documents.not.found";
|
||||
public static final String DUPLICATE_BENEFICIARY_CALL = "beneficiary.call.duplicate";
|
||||
public static final String USER_MUST_BE_ASSOCIATED_WITH_COMPANY="user.must.be.associated.with.company.to.create.application";
|
||||
public static final String COMPANY_ID_REQUIRED_FOR_PREFERRED_CALL = "company.id.required.for.preferred.call";
|
||||
public static final String CREATED_DATE = "createdDate";
|
||||
public static final String RESPONSE_DAYS_NOT_NULL="response.days.not.null";
|
||||
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";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user