2014.4.4 2:11
客户管理 跟进需求更新
2014.4.4 2:11
客户管理 跟进需求更新
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/pages/contacts/contacts_department.jsp
	src/main/webapp/WEB-INF/pages/contacts/contacts_detail.jsp
	src/main/webapp/WEB-INF/pages/contacts/contacts_edit.jsp
	src/main/webapp/WEB-INF/pages/contacts/contacts_group.jsp
	src/main/webapp/WEB-INF/pages/contacts/contacts_index.jsp
	src/main/webapp/WEB-INF/pages/customer/customer_comment.jsp
	src/main/webapp/WEB-INF/pages/customer/customer_create.jsp
	src/main/webapp/WEB-INF/pages/customer/customer_detail.jsp
	src/main/webapp/WEB-INF/pages/customer/customer_filter.jsp
	src/main/webapp/WEB-INF/pages/customer/customer_filter_result.jsp
	src/main/webapp/WEB-INF/pages/customer/customer_index.jsp
	src/main/webapp/WEB-INF/pages/customer/customer_project.jsp
	src/main/webapp/WEB-INF/pages/customer/customer_search.jsp
	src/main/webapp/WEB-INF/pages/customer/customer_task.jsp
	src/main/webapp/static_resources/css/contacts.css
2014.4.4 11:31
更正 客户列表排序问题