liusw 客户信息管理
Merge branch 'master' of https://github.com/rotek/rotek

Conflicts:
	src/main/webapp/assets/js/js_app/admin/customer/customer.js
Merge branch 'master' of https://github.com/rotek/rotek
liusw 客户信息管理
Merge branch 'master' of https://github.com/rotek/rotek