Merge branch 'master' of http://192.168.1.12:3000/caipin/cld

protected/controller/AdminController.php

@@ -51,7 +51,7 @@ class AdminController extends DooController {
 				}
 			}
 		}
-
+//我的代码
 		Doo::loadCore ( 'uri/DooUriRouter' );
 		$router = new DooUriRouter ();
 		$routeRs = $router->execute ( Doo::app ()->route, Doo::conf ()->SUBFOLDER );