Merge branch 'pxb' into xin

xin

5 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

 oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml

@@ -83,7 +83,10 @@
            <if test="criteria.orderId != null">
                and order_id = #{criteria.orderId}
            </if>
            <if test="criteria.orderNum != null">
            <if test="criteria.phone != null">
                and phone = #{criteria.phone}
            </if>
             <if test="criteria.orderNum != null">
                and order_num = #{criteria.orderNum}
            </if>
            <if test="criteria.merchantId != null">