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

yaowanxin

昨天 dcf2c669cac48202ceea2d6917dff89b9a84cb95

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

@@ -14,6 +14,9 @@
        <if test="req.tenantId != null and req.tenantId != ''">
            and tenant_id = #{req.tenantId}
        </if>
        <if test="req.status != null and req.status != ''">
            and status = #{req.status}
        </if>
        order by update_time desc
    </select>
</mapper>