Signed-off-by: 陈释荣 <11301119@bjtu.edu.cn>
项目总结报告、项目周报、个人日报。
Merge branch 'Csrr' of git@github.com:CRM2014/cf.git
验证

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

Conflicts:
	src/cf/crm/action/ajax/PermissionAjaxAction.java
IP
Merge branch '齐宇'
bug
junit
营销管理和客户管理部分
Signed-off-by: SabrinaWang
Signed-off-by: lovewindy <1063652094@qq.com>
Merge branch 'SabrinaWang' of git@github.com:CRM2014/cf.git
Merge branch 'windy' of git@github.com:CRM2014/cf.git
Signed-off-by: 刘梦莹 <11301099@bjtu.edu.cn>
系统测试完成