Merge branch 'pollex-dev' into sit

wayne

2022-03-11 242fad1691917c4fd82c7f04b6190a7113628e93

 pamapi/src/main/java/com/pollex/pam/web/rest/UserResource.java

@@ -1,15 +1,15 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.config.Constants;
import com.pollex.pam.domain.User;
import com.pollex.pam.repository.UserRepository;
import com.pollex.pam.security.AuthoritiesConstants;
import com.pollex.pam.service.MailService;
import com.pollex.pam.service.UserService;
import com.pollex.pam.service.dto.AdminUserDTO;
import com.pollex.pam.web.rest.errors.BadRequestAlertException;
import com.pollex.pam.web.rest.errors.EmailAlreadyUsedException;
import com.pollex.pam.web.rest.errors.LoginAlreadyUsedException;
import com.pollex.pam.business.config.Constants;
import com.pollex.pam.business.domain.User;
import com.pollex.pam.business.repository.UserRepository;
import com.pollex.pam.business.security.AuthoritiesConstants;
import com.pollex.pam.business.service.MailService;
import com.pollex.pam.business.service.UserService;
import com.pollex.pam.business.service.dto.AdminUserDTO;
import com.pollex.pam.business.web.errors.BadRequestAlertException;
import com.pollex.pam.business.web.errors.EmailAlreadyUsedException;
import com.pollex.pam.business.web.errors.LoginAlreadyUsedException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;