Merge remote-tracking branch 'origin/bd_dev' into bd_dev
This commit is contained in:
commit
0b3238e663
|
@ -48,6 +48,7 @@
|
|||
and order_status = 1
|
||||
AND (order_type in (1,2) or (order_Type = 3 and ORDER_TYPE_EXTEND = 1))
|
||||
and o.pay_time between #{param.startDate} and #{param.endDate}
|
||||
group by PK_REFERENCE
|
||||
) r
|
||||
left join cu_member cm on r.PK_REFERENCE = cm.pk_id
|
||||
WHERE ROWNUM <![CDATA[ <=]]> 30
|
||||
|
|
Loading…
Reference in New Issue