Resolved conflict

This commit is contained in:
piyushkag
2025-01-15 13:03:11 +05:30
59 changed files with 1694 additions and 70 deletions

View File

@@ -355,7 +355,22 @@ public class GepafinConstant {
public static final String NOTIFICATION_DELETED_SUCCESSFULLY="notification.deleted.successfully";
public static final String NOTIFICATION_UPDATED_SUCCESSFULLY="notification.updated.successfully";
public static final String USER_WITH_COMPANY_NOT_FOUND = "user.with.company.not.found";
public static final String STATUS = "status";
public static final String CALL="call";
public static final String TITLE="title";
public static final String MESSAGE="message";
public static final String HUB_ID="hubId";
public static final String ID="id";
public static final String IS_DELETED="isDeleted";
public static final String COMPANY_ID="companyId";
public static final String COMMENTS="comments";
public static final String DESCRIPTION_LONG="descriptionLong";
public static final String DESCRIPTION_SHORT="descriptionShort";
public static final String HUB="hub";
public static final String NAME="name";
public static final String USER_ACTION_FETCHED_SUCCESSFULLY = "user.action.fetched.successfully";
public static final String ACTION_CONTEXT_LABELS_FETCHED_SUCCESSFULLY = "action.context.labels.fetched.successfully";
//action log response
public static final String STATUS_CODE_STRING = "statusCode";
public static final String GET_STATUS_CODE_STRING = "status";
@@ -364,6 +379,13 @@ public class GepafinConstant {
public static final String SUM="sum";
public static final String MULTIPLY="multiply";
public static final String NUMERIC="numeric";
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 COUNT="count";
public static final String APPLICATION_PER_CALL="applicationPerCall";
public static final String APPLICATION_PER_STATUS="applicationPerStatus";
}