Resolved conflicts

2025-01-02 15:45:37 +05:30
parent cac4a7efac 3f72e09a26
commit 8220c709f4
158 changed files with 5895 additions and 1053 deletions
--- a/src/main/java/net/gepafin/tendermanagement/service/UserService.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/UserService.java
@@ -45,6 +45,6 @@ public interface UserService {
    UserEntity getUserByBeneficiaryId(Long beneficiaryId);

    public UserEntity getUserEntityById(Long userId);
-    List<UserResponseBean> getAllUsers(HttpServletRequest request, Long roleId);
+    List<UserResponseBean> getAllUsers(HttpServletRequest request, List<Long> roleIds);

 }