Merge branch 'master' of http://git.dever.cc/dever-product/churen

tool/work/database/question.php

@@ -17,6 +17,7 @@ $branch = function()
     {
         foreach ($data as $k => $v) {
             $group = Dever::db('manage/group')->find($v['group_id']);
+            $data[$k]['id'] = $v['group_id'];
             $data[$k]['name'] = $group['name'];
         }
         $array += $data;