Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-30 425e388128ba159fb9ff714d6bde24caa25e85ef

 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -66,8 +66,10 @@
    public R<?> login(@RequestBody LoginBody form)
    {
        // 用户登录
        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(),form.getSheBei());
        SysUser sysUser1 = userInfo.getSysUser();


        HashMap<String, Object> map = new HashMap<>();
        map.put("token",tokenService.createToken(userInfo));
        List<SysRole> roles = sysUser1.getRoles();