Merge branch 'master'

app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -41,7 +41,7 @@ class SoccerStringNoteListController extends Controller
         $dt->addColsFields('water_return', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
         $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
         $dt->addColsFields('result', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
-        $dt->addColsFields('money_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
+        $dt->addColsFields('money_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 140));
         $dt->addColsFields('order_status', array('sort' => false, 'width' => 80));
         $dt->addColsFields('account_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 230));
         $dt->addColsFields('settle_status', array('sort' => false, 'width' => 90));