Resolved conflicts
This commit is contained in:
@@ -101,6 +101,7 @@ public class GepafinConstant {
|
||||
public static final String STATUS_SAME_ERROR = "status.same.error";
|
||||
public static final String INVALID_STATUS_CHANGE_FROM_DRAFT = "invalid.status.change.from.draft";
|
||||
public static final String INVALID_STATUS_CHANGE_FROM_PUBLISH = "invalid.status.change.from.publish";
|
||||
public static final String INVALID_STATUS_CHANGE_FROM_PUBLISH_TO_DRAFT = "invalid.status.change.from.publish.to.draft";
|
||||
public static final String STATUS_CANNOT_BE_CHANGED = "status.cannot.be.changed";
|
||||
public static final String PUBLISHED_CALL_NOT_UPDATE = "published.call.not.update";
|
||||
public static final String INVALID_USER = "invalid_user";
|
||||
@@ -531,6 +532,12 @@ public class GepafinConstant {
|
||||
public static final String GET_FIELD_VALUE="getFieldValue";
|
||||
public static final String GET_REPORT_ENABLE="getReportEnable";
|
||||
public static final String GET_REPORT_HEADER="getReportHeader";
|
||||
|
||||
public static final String APPOINTMENT_ID="appointmentId";
|
||||
public static final String APPLICATION_STATUS="applicationStatus";
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user