Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

64850858

2021-06-25 0802677d0b609abc8de0f0d882c6dbf483fc1987

 src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java

@@ -2,7 +2,6 @@

import com.genersoft.iot.vmp.conf.UserSetup;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;