整理代码
验证

Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>
Merge commit 'cf7ae481d9d9cebcc75894d6046d1cc6aecf8129'
Merge branch '齐宇'

Conflicts:
	src/cf/crm/action/ajax/PermissionAjaxAction.java