Merge remote-tracking branch 'origin/master'

luodangjia

2024-06-05 caad86093475a38d79886eb8e77aa288bfb74d89

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java

@@ -160,7 +160,7 @@
    }


    public void setCarTime(Integer carTime) {
    public void setCarTime(double carTime) {
        this.carTime = carTime;
    }