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

Commit f4052ed3 authored by 胡佳晨's avatar 胡佳晨

Merge branch 'dev' into test

parents a2cab66f 050115bb
......@@ -198,7 +198,7 @@
FROM kylin_order_tickets AS ot
LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -pay_countdown_minute MINUTE)
WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -(pay_countdown_minute+1) MINUTE)
<if test="userId!=''">
AND user_id = #{userId}
</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