Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java

@@ -151,7 +151,9 @@
            orderCharteredCar.setOrderNumber(this.getOrderNum());
            orderCharteredCar.setCompanyId(1);
            orderCharteredCar.setIsDelete(1);
            orderCharteredCar.setState(1);
            orderCharteredCar.setInsertTime(new Date());
            orderCharteredCar.setCarTime(charteredCarDto.getCarTime());

            String strDateTime = charteredCarDto.getTraveltime();
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-M-d H:m");