Merge remote-tracking branch 'origin/master'

无关风月

1 天以前 e345b36025818615eb68d37819eaff312d1fb986

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java

@@ -48,4 +48,13 @@

    List<TOrderCrossCity> queryOrders(@Param("driverId") Integer driverId, @Param("lineShiftDriverId") Integer lineShiftDriverId,
                                     @Param("state") List<Integer> state);

    List<Map<String, Object>> paymentOrderStatisticsList(Page<Map<String, Object>> page, @Param("paymentCode") String paymentCode,
                                                         @Param("orderCode") String orderCode, @Param("userPhone") String userPhone,
                                                         @Param("driverPhone") String driverPhone, @Param("createTimeStart") String createTimeStart,
                                                         @Param("createTimeEnd") String createTimeEnd, @Param("paymentTimeStart") String paymentTimeStart,
                                                         @Param("paymentTimeEnd") String paymentTimeEnd,@Param("orderType") Integer orderType);



}