fix a bug in merchant oplog chart
Merge branch 'tmp'