Signed-off-by: SabrinaWang <673458347@qq.com>
Merge branch 'master' of https://github.com/CRM2014/cf into SabrinaWang
分页栏
Merge commit '198a96538246e62d4340f68262e7ff449376ea33'
Merge branch 'qiyu'
添加分页栏
文件路径
Signed-off-by: 刘梦莹 <11301099@bjtu.edu.cn>
修改HTML页面地址链接
分页栏
用户菜单栏
html页面链接修改
修改service.html页面
Signed-off-by: SabrinaWang <673458347@qq.com>
Merge commit '11ee827d33a2111fe848995400f7c9419960f976'

Conflicts:
	WebContent/html/marketing.chance/add.html
	WebContent/html/marketing.chance/assign.html
	WebContent/html/marketing.chance/list.html
	WebContent/html/marketing.plan/execute.html
	WebContent/html/marketing.plan/list.html
	WebContent/html/marketing.plan/make.html
	WebContent/html/statistics/loss.html
	WebContent/html/statistics/service.html
Merge branch 'wpy' of git@github.com:CRM2014/cf.git
注释例子
Signed-off-by: 七国军队 <1211412423@qq.com> 秦辉
Merge branch 'qinhui' of git@github.com:CRM2014/cf.git
。。
Signed-off-by: xiaoping <xiaoping>

xml database和报表