Merge remote-tracking branch 'origin/master'

xuhy

2024-05-28 5470d21a35286abe41fafc25a7deaabefd7c55da

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

@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.CharteredCar.server;

import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.CharteredCar.dto.CharteredCarDto;
import com.stylefeng.guns.modular.CharteredCar.model.OrderCharteredCar;
import com.stylefeng.guns.modular.system.util.ResultUtil;

@@ -54,5 +55,5 @@
    ResultUtil addCancle(Integer id, String reason, String remark, Integer uid) throws Exception;



    ResultUtil createOrder(CharteredCarDto charteredCarDto);
}