Merge remote-tracking branch 'origin/main'

ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineFileVO.java

@@ -36,7 +36,15 @@ public class AirlineFileVO {
      * waypoint文件地址
      */
     private String fileUrl;
+    /**
+     * 飞行器厂商
+     */
+    private String airVendor;
 
+    /**
+     * 飞行器类型
+     */
+    private String airType;
 
     /**
      * 原始航线url