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

Conflicts:
	protected/controller/AdminController.php

protected/controller/AdminController.php

@@ -51,7 +51,8 @@ class AdminController extends DooController {
 				}
 			}
 		}
-//我的代码我的代码
+		//添加注释
+//我的代码
 		Doo::loadCore ( 'uri/DooUriRouter' );
 		$router = new DooUriRouter ();
 		$routeRs = $router->execute ( Doo::app ()->route, Doo::conf ()->SUBFOLDER );
@@ -204,9 +205,9 @@ function adduser(){
 		$cid=is_numeric($this->get_args('cid'))?$this->get_args('cid'):0;
 		$hiredate=$this->get_args('hiredate')?$this->get_args('hiredate'):"";
 		$nature=is_numeric($this->get_args('nature'))?$this->get_args('nature'):1;
-  
+
 		if(!empty($username)&&!empty($password)&&!empty($cid)&&!empty($hiredate)&&!empty($nature)){
-    
+
 			Doo::loadModel ( 'L_category' );
 			Doo::loadModel ( 'staff' );
 			Doo::loadModel ( 'tag' );