Merge pull request '2.7号功能提交' (#156) from feature/add_item into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/156

Application/Admin/Controller/TimingController.class.php

@@ -649,7 +649,7 @@ class TimingController extends AdminController {
                             continue;
                         }
                         //
-                        if (isset($return[$value['company_id']."-".$sval['promote_id']."-".$v['relation_game_id']])) {
+                        if (!isset($return[$value['company_id']."-".$sval['promote_id']."-".$v['relation_game_id']])) {
                             $return[$value['company_id']."-".$sval['promote_id']."-".$v['relation_game_id']] = !$is_inside?($v['sum_money']-($v['withhold']?$v['withhold']:0)):0;
                         } else {
                             $return[$value['company_id']."-".$sval['promote_id']."-".$v['relation_game_id']] += !$is_inside?($v['sum_money']-($v['withhold']?$v['withhold']:0)):0;