Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

 zhang-content/src/main/java/com/ruoyi/domain/dto/PriceDto.java

@@ -35,6 +35,8 @@

    private String type;

    private String destination;

    private List<ZTravelPriceDetail> detailList;

}