Merge remote-tracking branch 'origin/master'

src/main/java/com/cloudcross/ssp/web/back/main/ClientAccountController.java

@@ -38,7 +38,7 @@ import com.cloudcross.ssp.common.consts.Status;
 import com.cloudcross.ssp.common.utils.LangUtil;
 import com.cloudcross.ssp.common.utils.Md5Tool;
 import com.cloudcross.ssp.common.utils.Pager;
-@Controller("back.clientAccountController")
+@Controller
 @RequestMapping("/back/main/client-account")
 public class ClientAccountController extends SimpleController{
 	

src/main/java/com/cloudcross/ssp/web/operator/main/AuthorityOperatorController.java → src/main/java/com/cloudcross/ssp/web/operator/main/AuthorityController.java

@@ -47,9 +47,9 @@ import com.cloudcross.ssp.service.IUserLoginService;
  */
 
 
-@Controller
+@Controller("operator.AuthorityController")
 @RequestMapping("/operator/main/authority")
-public class AuthorityOperatorController extends SimpleController{
+public class AuthorityController extends SimpleController{
 	
 	@Autowired
 	private FreemarkerTemplateProcessor templateProcessor;