Resolved conflicts
This commit is contained in:
@@ -332,7 +332,7 @@ public class GepafinConstant {
|
||||
public static final String DATA_STRING = "data";
|
||||
public static final String DOCUMENT_ATTACHMENT_ID_STRING = "documentAttachmentId";
|
||||
public static final String TEMP_FILE_PATH = "/tmp/";
|
||||
public static final String RICHIESTA_CLIENTE_STRING = "richiestaCliente";
|
||||
public static final String RICHIESTE_CLIENTE_STRING = "richiesteCliente";
|
||||
public static final String ID_STRING = "id";
|
||||
public static final String NULL_STRING = "null";
|
||||
public static final String NDG_STRING = "ndg";
|
||||
@@ -391,6 +391,16 @@ public class GepafinConstant {
|
||||
public static final String NON_EMPTY_TABLES="nonEmptyTables";
|
||||
public static final String VALIDATION_IN_TABLE = "validation.table.message";
|
||||
public static final String CALL_EXPIRED="call.expired";
|
||||
public static final String PROTOCOL="protocol";
|
||||
public static final String PROTOCOL_NUMBER="protocolNumber";
|
||||
public static final String NOTE="note";
|
||||
public static final String INTERNAL_NOTE="internalNote";
|
||||
public static final String ACTION_TYPE="actionType";
|
||||
public static final String ACTION_CONTEXT="actionContext";
|
||||
public static final String METHOD_TYPE="methodType";
|
||||
|
||||
|
||||
|
||||
public static final String AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO = "amount.request.should.greated.then.zero";
|
||||
|
||||
|
||||
@@ -436,6 +446,13 @@ public class GepafinConstant {
|
||||
|
||||
|
||||
|
||||
|
||||
public static final String APPOINTMENT_CANNOT_BE_CREATED = "appointment.cannot.be.created";
|
||||
public static final String APPOINTMENT_NOT_CREATED = "appointment.not.created";
|
||||
|
||||
public static final String SWITCH="switch";
|
||||
public static final String IS_CHECK_LIST_ITEM="isChecklistItem";
|
||||
public static final String VALIDATION_FAILED_FOR_CHECKLIST="validation.failed.checklist";
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user