Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

4 天以前 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192

 src/main/resources/mapper/aftersalesservice/AfterSalesNearExpiryMapper.xml

@@ -25,7 +25,7 @@

    <select id="listPage" resultType="com.ruoyi.aftersalesservice.pojo.AfterSalesNearExpiry">
        select * from after_sales_near_expiry
        where 1 = 1
        <where>
        <if test="req.expireDate != null">
            AND expire_date = #{req.expireDate}
        </if>
@@ -35,6 +35,7 @@
        <if test="req.status != null">
            AND status = #{req.status}
        </if>
        </where>
        order by create_time desc
    </select>