Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-17 ce7f72ff0a44cb6e980b05a538a0339439248b99

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java

@@ -130,6 +130,9 @@
      if (loginUser == null) {
         throw new RuntimeException("令牌已过期，请重新登录！");
      }
      if(null == loginUser.getUserid()){
         loginUser.setUserid(loginUser.getSysUser().getUserId());
      }
      return loginUser;
   }