Merge remote-tracking branch 'origin/master'

feige

2024-10-07 de1823591a01addd54cb1aab4d78397dcb020472

 zhang-content/src/main/java/com/ruoyi/domain/ZTravelBase.java

@@ -33,6 +33,12 @@
     */
    private String feeId;

    @Excel(name = "车次/航班")
    private String flight;

    @Excel(name = "出行方式")
    private String type;

    /**
     * 地点
     */