conflicts resolved

This commit is contained in:
harish
2024-08-26 12:29:18 +05:30
35 changed files with 341 additions and 190 deletions

View File

@@ -10,6 +10,7 @@ public class GepafinConstant {
public static final String UPDATE_USER_ERROR_MSG = "update_user_error_msg";
public static final String DELETE_USER_ERROR_MSG = "delete_user_error_msg";
public static final String GET_USER_SUCCESS_MSG = "get_user_success_msg";
public static final String USER_NOT_ACTIVE_MSG = "user.not.active";
public static final String ROLE_CREATED_SUCCESS_MSG = "role.created.success";
public static final String ROLE_UPDATED_SUCCESS_MSG = "role.updated.success";
@@ -41,6 +42,7 @@ public class GepafinConstant {
public static final String PASSWORD_MIN_LEN ="pass.min.len.msg";
public static final String EMAIL_ALREADY_EXISTS = "email.already.exists";
public static final String DOCUMENT_ID_NOT_FOUND="document.id.not.found";
public static final String INVALID_DATE_MSG = "call.invalid.date";
public static final String RESET_PASSWORD_INITIATED = "password.reset.initiated";
public static final String PASSWORD_RESET_SUCCESS = "password.reset.success";