Merge remote-tracking branch 'origin/master'

guyue

3 天以前 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9

 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);
}