add sample query with remarks column
Merge remote-tracking branch 'cloud/master'
update order_type and remarks in DBOrderDAO