Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

zqy

2024-05-26 b1643b619696f2578e22d7f3bcc2cacca63a1ce6

 zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java

@@ -213,6 +213,10 @@
        zTravelPrice.setEndTime(priceDto.getEndTime());
        zTravelPrice.setTotalDay(totalDay);
        zTravelPrice.setTitle(priceDto.getTitle());
        zTravelPrice.setTableName(priceDto.getTableName());
        zTravelPrice.setProperty(priceDto.getProperty());
        zTravelPrice.setType(priceDto.getType());
        zTravelPrice.setDestination(priceDto.getDestination());
        zTravelPrice.setEat(eatTotal);
        zTravelPrice.setStay(stayTotal);
        zTravelPrice.setTraffic(trafficTotal);
@@ -325,6 +329,10 @@
        zTravelPrice.setEndTime(priceDto.getEndTime());
        zTravelPrice.setTotalDay(totalDay);
        zTravelPrice.setTitle(priceDto.getTitle());
        zTravelPrice.setTableName(priceDto.getTableName());
        zTravelPrice.setProperty(priceDto.getProperty());
        zTravelPrice.setType(priceDto.getType());
        zTravelPrice.setDestination(priceDto.getDestination());
        zTravelPrice.setEat(eatTotal);
        zTravelPrice.setStay(stayTotal);
        zTravelPrice.setTraffic(trafficTotal);