Merge branch 'Phase3' into pollex-dev

wayne

2022-03-10 e8241decc705f9db3e46aed7b3a3f8b3188cf820

 pamapi/src/main/java/com/pollex/pam/config/WebsocketConfiguration.java

@@ -1,6 +1,6 @@
package com.pollex.pam.config;

import com.pollex.pam.security.AuthoritiesConstants;
import com.pollex.pam.business.security.AuthoritiesConstants;
import java.security.Principal;
import java.util.*;
import org.springframework.context.annotation.Bean;