Merge remote-tracking branch 'origin/master'

liuhaonan

2022-08-10 f81b7065a40d1f9428d204b3bd6bcd126f306a19

 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;