Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 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;

}