Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg

liyong

19 小时以前 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47

 src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java

@@ -73,7 +73,7 @@


    @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")

    @Log(title = "账户解锁", businessType = BusinessType.OTHER)

    @GetMapping("/unlock//{userName}")

    @GetMapping("/unlock/{userName}")

    public AjaxResult unlock(@PathVariable("userName") String userName)

    {

        passwordService.clearLoginRecordCache(userName);