Merge remote-tracking branch 'origin/master'

无关风月

4 天以前 8537a164dbd4c8696c3269141a8f18922d4ed15f

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -318,6 +318,7 @@
        insertUserRole(userId, roleIds);
    }


    /**
     * 修改用户状态
     *