Merge remote-tracking branch 'origin/master'

aircraft-common/src/main/java/com/aircraft/utils/SecurityUtils.java

@@ -164,11 +164,7 @@ public class SecurityUtils {
      * @return 系统用户类型
      */
     public static UserTypeEnum getCurrentUserType(){
-        UserDetails userDetails = getCurrentUser();
+        return getCurrentUserTypeVo();
-        // 将 Java 对象转换为 JSONObject 对象
-        JSONObject jsonObject = (JSONObject) JSON.toJSON(userDetails);
-        String userTypeStr = jsonObject.getString("userType");
-        return UserTypeEnum.valueOf(userTypeStr);
     }
 
     public static String getCurrentEmployee(){