Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/modules/moonclub/controllers/ReserveController.php

@@ -122,7 +122,7 @@ class ReserveController extends MoonClubBaseController
             if($reserve->status ==2){
                 $data[$key]['status'] = Reserve::$status_option[2];//已处理
             } else {
-                $data[$key]['status'] = Reserve::$status_option[1];//待处理
+                $data[$key]['status'] = Reserve::$status_option[1];//待处理 
             }
             $data[$key]['num'] = $reserve->num;