Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-24 bef458cd14d2e0f2b09d76b609291f47be3cd525

 ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java

@@ -82,7 +82,7 @@
        if (loginUserInfo == null) {
            return null;
        }
        if (!AdministratorEnums.ADMIN.getCode().equals(loginUserInfo.getAdministratorType())) {
        if (AdministratorEnums.NORMAL.getCode().equals(loginUserInfo.getAdministratorType())) {
            return loginUserInfo.getUserId();
        }
        return null;