Merge remote-tracking branch 'origin/master'

guyue

2025-08-01 5fd988c9e31b9e3ad40c509c6562c8ff61b1198f

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java

@@ -96,8 +96,7 @@
      String onconParam = edu.yale.its.tp.cas.client.Util.getOnconParam(session);
      onconParam = new String(Base64.decodeBase64(onconParam), "UTF-8");
      LoginUser loginUser = JSON.parseObject(onconParam, LoginUser.class);
      log.debug("登录账号: " + JSON.toJSONString(loginUser));
		

      //获取菜单列表
      User user = userMapper.getByAccount(loginUser.getImUser());
      if (null == user) {