记得上下班打卡 | git大法好,push需谨慎

Commit dfbfb1c2 authored by jiangxiulong's avatar jiangxiulong

Merge branch 'jxl_1214_refund' into dev_merchant

parents ef40e207 b6ce285c
......@@ -340,7 +340,7 @@
<if test="expressContacts != null and expressContacts != ''">AND kot.express_contacts LIKE concat('%',
#{expressContacts}, '%')
</if>
<if test="expressStatus != '' and expressStatus != 1 and expressStatus != 70">AND oe.express_status =
<if test="expressStatus != '' and expressStatus != 1 and expressStatus != 70 and expressStatus != 80">AND oe.express_status =
${expressStatus}
</if>
<if test="expressStatus == 1">AND (oe.express_status IS NULL OR oe.express_status = ${expressStatus})</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment