Merge branch 'pxb' into xin

xin

yesterday d3563f0bdb487124d79cdd20d0f8bfc79db31f24

 oying-system/src/main/java/com/oying/modules/rider/mapper/RiderOrderRecordMapper.java

@@ -19,4 +19,6 @@
    IPage<RiderOrderRecord> findAll(@Param("criteria") RiderOrderRecordQueryCriteria criteria, Page<Object> page);

    List<RiderOrderRecord> findAll(@Param("criteria") RiderOrderRecordQueryCriteria criteria);

    RiderOrderRecord selectRiderInfo(@Param("orderNum") String orderNum);
}