Merge branch 'master' into release

This commit is contained in:
Jay 2018-08-23 23:33:48 +08:00
commit d20d5ddbf7

View File

@ -166,7 +166,7 @@ r.get('/channel/:chid/opay/bar', async (c, n) => {
where
tw.opayid != ''
and tw.id = $1
and ctime >= $2
and list.ctime >= $2
group by list.opayid`
values = [chid, setting.start_date]
let priceResult = await c.db.query({