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

guoshilong

2024-04-09 2f4555ade506bd5e7c8cafef5d717c635edfab2d

 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){