目录修改
Signed-off-by: lovewindy <1063652094@qq.com>
联系人添加
Merge branch 'qiyu'

Conflicts:
	WebContent/view/customer/contact/add.jsp
Merge commit '550b8eba959f5f7868e76044f7939284ccb4e273'

Conflicts:
	WebContent/view/customer/basic/list.jsp
	WebContent/view/permission/add.jsp
Merge commit 'bb2765687d186a6504ad9a5b7e42fc68815f709b'

Conflicts:
	WebContent/view/marketing/chance/add.jsp
	WebContent/view/permission/add.jsp
Signed-off-by: lovewindy <1063652094@qq.com>
marketing/chance/add.jsp
Merge commit '695835ae1cdb35e89416f468f091b79fa234ddcf'
no message
客户Action
Signed-off-by: lovewindy <1063652094@qq.com>
Merge commit '58a438cdd11362eb8d9889bd2baa665b756aa38d'
客户管理bug
Signed-off-by: WpyOcean <wokunisa@163.com>
统计
Merge commit '0221a8f75ec31c3d59516befbf6487a51ab2c7ed'
分页bug
分页bug2
页面问题

Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>