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

guoshilong

2024-03-13 c8b03d3da4e29fc3fb9a42ca157738256c331a00

 skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java

@@ -166,6 +166,8 @@
            userInfo.getDetail().set("resIds",attRes.getData());
         }

         //返回手机号
         userInfo.getDetail().set("phone",Base64Utils.getBase64Encode(user.getPhone()));

         String deptStr = "";
         if (userInfo.getUser().getDeptId().indexOf(",") > 0){