Resolved conflicts

This commit is contained in:
rajesh
2024-08-28 17:43:21 +05:30
13 changed files with 134 additions and 38 deletions

View File

@@ -97,6 +97,10 @@ public class GepafinConstant {
public static final String UPDATE_USER_STATUS_SUCCESS_MSG = "update.user.status.success";
public static final String FIELD_NOT_NULL = "field.not.null";
public static final String FIELD_NOT_EMPTY = "field.not.empty";
public static final String UPDATE_CALL_STATUS_SUCCESS_MSG = "update_call_status_success_msg";
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 STATUS_CANNOT_BE_CHANGED = "status.cannot.be.changed";
public static final String INVALID_STATUS_TRANSITION = "invalid.status.transition";
}