Merge remote-tracking branch 'origin/master'

guyue

2025-08-01 5fd988c9e31b9e3ad40c509c6562c8ff61b1198f

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java

@@ -70,4 +70,9 @@


    List<Map<String,Object>> getSurcharge(Object id,Integer orderType);

    List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId);


    List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId);
}