Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-12 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -44,6 +44,7 @@
        caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
        caches.add(new SysCache(CacheConstants.AUTH_CONFIG_KEY, "授权配置信息"));
        caches.add(new SysCache(CacheConstants.CAMERA_LIST_KEY, "相机列表"));
        caches.add(new SysCache(CacheConstants.USER_LIST_KEY, "用户列表"));
    }

    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")