Merge branch 'pxb' into xin

xin

4 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

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

@@ -31,6 +31,7 @@
        <result column="user_id" property="userId"/>
        <result column="delivery_fee_id" property="deliveryFeeId"/>
        <result column="order_time" property="orderTime"/>
        <result column="user_name" property="userName"/>
    </resultMap>

    <sql id="Base_Column_List">
@@ -62,7 +63,8 @@
        merchant_longitude,
        merchant_latitude,
        delivery_fee_id,
        order_time
        order_time,
        user_name
    </sql>
    <select id="findAll" resultMap="BaseResultMap">
        select
@@ -75,10 +77,16 @@
            <if test="criteria.userId != null">
                and user_id = #{criteria.userId}
            </if>
            <if test="criteria.userName != null">
                and user_name = #{criteria.userName}
            </if>
            <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">