Resolved conflict
This commit is contained in:
@@ -499,6 +499,36 @@ public class GepafinConstant {
|
||||
|
||||
public static final String PASSWORD_EXPIRED = "PasswordExpired";
|
||||
public static final String PASSWORD_EXPIRED_LOGIN_TO_ODESSA = "password.expired.for.login.to.odessa";
|
||||
|
||||
public static final String APPLICATION="application";
|
||||
public static final String APPLICATION_ID="applicationId";
|
||||
public static final String USER_WITH_COMPANY_ID="userWithCompanyId";
|
||||
public static final String ASSIGNED_USER_ID="assignedUserId";
|
||||
public static final String APPLICATION_USER_ID="applicationUserId";
|
||||
public static final String INVALID_USER_ID="invalid.user";
|
||||
public static final String COMPANY_NAME="companyName";
|
||||
public static final String TABLE_COLUMNS="table_columns";
|
||||
public static final String PREDEFINED="predefined";
|
||||
public static final String EBABLE_CSV="enableCsv";
|
||||
public static final String LABEL_CSV="labelCsv";
|
||||
public static final String GET="get";
|
||||
public static final String REPORT_COLUMNS="reportColumns";
|
||||
public static final String FIELD_TYPE="fieldtype";
|
||||
public static final String ENABLE_FORMULA="enableFormula";
|
||||
public static final String STATE_FIELD_DATA="stateFieldData";
|
||||
public static final String REPORT_ENABLE="reportEnable";
|
||||
public static final String TABLE="table";
|
||||
public static final String GET_FIELD_TYPE="getFieldType";
|
||||
public static final String GET_APPLICATION_FORM_ID="getApplicationFormId";
|
||||
public static final String GET_APPLICATION_ID="getApplicationId";
|
||||
public static final String GET_ID="getId";
|
||||
public static final String GET_CLASS="getClass";
|
||||
public static final String GET_FORM_ID="getFormId";
|
||||
public static final String GET_FIELD_ID="getFieldId";
|
||||
public static final String GET_FIELD_LABEL="getFieldLabel";
|
||||
public static final String GET_FIELD_VALUE="getFieldValue";
|
||||
public static final String GET_REPORT_ENABLE="getReportEnable";
|
||||
public static final String GET_REPORT_HEADER="getReportHeader";
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user