Merge branch 'master' into release

2018-08-22 22:12:03 +08:00 · 2018-08-22 22:12:03 +08:00 · 5a0a39a058
commit 5a0a39a058
parent 6db4e26173 d2cfcac05f
1 changed files with 2 additions and 1 deletions
--- a/route/api/twitch/index.js
+++ b/route/api/twitch/index.js
@ -108,8 +108,9 @@ r.get('/channel/:chid/opay/setting', checkSession, getChannelList, hasChannel('c
    text,
    values
  })
+
  c.obj = resObject('Success', {
-    list: result.rows
+    setting: result.rowCount === 0 ? {} : result.rows[0]
  })
 })