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
营销
Merge branch '齐宇'
Signed-off-by: 七国军队 <1211412423@qq.com> 秦辉
Signed-off-by: 刘梦莹 <11301099@bjtu.edu.cn>
系统测试完成
Signed-off-by: xiaoping <xiaoping>

DaoAdapter测试
Merge branch 'LiuMengYing' of git@github.com:CRM2014/cf.git
Merge branch 'qinhui' of git@github.com:CRM2014/cf.git
Merge branch 'wpy' of git@github.com:CRM2014/cf.git
Merge commit '7dfc96c4d6bd0a4d46b329591401e0d6f1b99518'
Signed-off-by: 刘梦莹 <11301099@bjtu.edu.cn>
个人日报
Merge branch 'LiuMengYing' of git@github.com:CRM2014/cf.git
个人总结KO
Signed-off-by: WpyOcean <wokunisa@163.com>